From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
To: Kukjin Kim <kgene@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Subject: [PATCH 7/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5440 boards
Date: Sun, 12 Apr 2015 21:24:54 +0900 [thread overview]
Message-ID: <1428841494-20769-8-git-send-email-k.kozlowski.k@gmail.com> (raw)
In-Reply-To: <1428841494-20769-1-git-send-email-k.kozlowski.k@gmail.com>
The phandle notation reduces possible mistakes when overriding nodes.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
---
arch/arm/boot/dts/exynos5440-sd5v1.dts | 10 ++--
arch/arm/boot/dts/exynos5440-ssdk5440.dts | 85 +++++++++++++++----------------
2 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts
index 268609a42b2c..a98501bab6fc 100644
--- a/arch/arm/boot/dts/exynos5440-sd5v1.dts
+++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts
@@ -27,13 +27,13 @@
};
};
- gmac: ethernet@00230000 {
- fixed_phy;
- phy_addr = <1>;
- };
-
spi {
status = "disabled";
};
};
+
+&gmac {
+ fixed_phy;
+ phy_addr = <1>;
+};
diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
index ff55dac6e219..e4443f4e6572 100644
--- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts
+++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts
@@ -20,59 +20,58 @@
bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
};
- spi_0: spi@D0000 {
-
- flash: w25q128@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "winbond,w25q128";
- spi-max-frequency = <15625000>;
- reg = <0>;
- controller-data {
- samsung,spi-feedback-delay = <0>;
- };
+ fixed-rate-clocks {
+ xtal {
+ compatible = "samsung,clock-xtal";
+ clock-frequency = <50000000>;
+ };
+ };
+};
- partition@00000 {
- label = "BootLoader";
- reg = <0x60000 0x80000>;
- read-only;
- };
+&pcie_0 {
+ reset-gpio = <&pin_ctrl 5 0>;
+ status = "okay";
+};
- partition@e0000 {
- label = "Recovery-Kernel";
- reg = <0xe0000 0x300000>;
- read-only;
- };
+&pcie_1 {
+ reset-gpio = <&pin_ctrl 22 0>;
+ status = "okay";
+};
- partition@3e0000 {
- label = "CRAM-FS";
- reg = <0x3e0000 0x700000>;
- read-only;
- };
+&spi_0 {
+ flash: w25q128@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "winbond,w25q128";
+ spi-max-frequency = <15625000>;
+ reg = <0>;
+ controller-data {
+ samsung,spi-feedback-delay = <0>;
+ };
- partition@ae0000 {
- label = "User-Data";
- reg = <0xae0000 0x520000>;
- };
+ partition@00000 {
+ label = "BootLoader";
+ reg = <0x60000 0x80000>;
+ read-only;
+ };
+ partition@e0000 {
+ label = "Recovery-Kernel";
+ reg = <0xe0000 0x300000>;
+ read-only;
};
- };
+ partition@3e0000 {
+ label = "CRAM-FS";
+ reg = <0x3e0000 0x700000>;
+ read-only;
+ };
- fixed-rate-clocks {
- xtal {
- compatible = "samsung,clock-xtal";
- clock-frequency = <50000000>;
+ partition@ae0000 {
+ label = "User-Data";
+ reg = <0xae0000 0x520000>;
};
- };
- pcie@290000 {
- reset-gpio = <&pin_ctrl 5 0>;
- status = "okay";
};
- pcie@2a0000 {
- reset-gpio = <&pin_ctrl 22 0>;
- status = "okay";
- };
};
--
2.1.0
next prev parent reply other threads:[~2015-04-12 12:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-12 12:24 [PATCH 0/7] ARM: dts: Refactor Exynos5 boards for phandle notation Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 1/7] ARM: dts: Add labels to nodes used in Exynos5 based DTS Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 2/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5250 Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 3/7] ARM: dts: Remove duplicated I2C 7 nodes in Snow Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 4/7] ARM: dts: Use phandle notation for overriding nodes in Arndale Octa Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 5/7] ARM: dts: Use phandle notation for overriding nodes in Exynos5420 Krzysztof Kozlowski
2015-04-12 12:24 ` [PATCH 6/7] ARM: dts: Use phandle notation for overriding nodes in SMDK5420 Krzysztof Kozlowski
2015-04-12 12:24 ` Krzysztof Kozlowski [this message]
2015-04-12 20:07 ` [PATCH 0/7] ARM: dts: Refactor Exynos5 boards for phandle notation Arnd Bergmann
2015-04-13 10:54 ` Krzysztof Kozłowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428841494-20769-8-git-send-email-k.kozlowski.k@gmail.com \
--to=k.kozlowski.k@gmail.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).