[PATCH v2 7/7] ARM: dts: exynos5: Use labels for overriding nodes in Exynos5440 boards
Usage of labels instead of full paths reduces possible mistakes when
overriding nodes.
Signed-off-by: Krzysztof Kozlowski
---
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@0023 {
- fixed_phy;
- phy_addr = <1>;
- };
-
spi {
status = "disabled";
};
};
+
+ {
+ 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@0x8000 mem=6144M@0x1
console=ttySAC0,115200";
};
- spi_0: spi@D {
-
- 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 = <5000>;
+ };
+ };
+};
- partition@0 {
- label = "BootLoader";
- reg = <0x6 0x8>;
- read-only;
- };
+_0 {
+ reset-gpio = <_ctrl 5 0>;
+ status = "okay";
+};
- partition@e {
- label = "Recovery-Kernel";
- reg = <0xe 0x30>;
- read-only;
- };
+_1 {
+ reset-gpio = <_ctrl 22 0>;
+ status = "okay";
+};
- partition@3e {
- label = "CRAM-FS";
- reg = <0x3e 0x70>;
- read-only;
- };
+_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@ae {
- label = "User-Data";
- reg = <0xae 0x52>;
- };
+ partition@0 {
+ label = "BootLoader";
+ reg = <0x6 0x8>;
+ read-only;
+ };
+ partition@e {
+ label = "Recovery-Kernel";
+ reg = <0xe 0x30>;
+ read-only;
};
- };
+ partition@3e {
+ label = "CRAM-FS";
+ reg = <0x3e 0x70>;
+ read-only;
+ };
- fixed-rate-clocks {
- xtal {
- compatible = "samsung,clock-xtal";
- clock-frequency = <5000>;
+ partition@ae {
+ label = "User-Data";
+ reg = <0xae 0x52>;
};
- };
- pcie@29 {
- reset-gpio = <_ctrl 5 0>;
- status = "okay";
};
- pcie@2a {
- reset-gpio = <_ctrl 22 0>;
- status = "okay";
- };
};
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 7/7] ARM: dts: exynos5: Use labels for overriding nodes in Exynos5440 boards
Usage of labels instead of full paths reduces possible mistakes when
overriding nodes.
Signed-off-by: Krzysztof Kozlowski k.kozlowsk...@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@0023 {
- 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@0x8000 mem=6144M@0x1
console=ttySAC0,115200;
};
- spi_0: spi@D {
-
- 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 = 5000;
+ };
+ };
+};
- partition@0 {
- label = BootLoader;
- reg = 0x6 0x8;
- read-only;
- };
+pcie_0 {
+ reset-gpio = pin_ctrl 5 0;
+ status = okay;
+};
- partition@e {
- label = Recovery-Kernel;
- reg = 0xe 0x30;
- read-only;
- };
+pcie_1 {
+ reset-gpio = pin_ctrl 22 0;
+ status = okay;
+};
- partition@3e {
- label = CRAM-FS;
- reg = 0x3e 0x70;
- 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@ae {
- label = User-Data;
- reg = 0xae 0x52;
- };
+ partition@0 {
+ label = BootLoader;
+ reg = 0x6 0x8;
+ read-only;
+ };
+ partition@e {
+ label = Recovery-Kernel;
+ reg = 0xe 0x30;
+ read-only;
};
- };
+ partition@3e {
+ label = CRAM-FS;
+ reg = 0x3e 0x70;
+ read-only;
+ };
- fixed-rate-clocks {
- xtal {
- compatible = samsung,clock-xtal;
- clock-frequency = 5000;
+ partition@ae {
+ label = User-Data;
+ reg = 0xae 0x52;
};
- };
- pcie@29 {
- reset-gpio = pin_ctrl 5 0;
- status = okay;
};
- pcie@2a {
- reset-gpio = pin_ctrl 22 0;
- status = okay;
- };
};
--
2.1.0
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
