arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc to -u-boot...

Move U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot
specific device tree include file armada-38x-controlcenterdc-u-boot.dtsi.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
new file mode 100644 (file)
index 0000000..0a94df9
--- /dev/null
+++ b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
@@ -0,0 +1,25 @@
+&gpio0 {
+       u-boot,dm-pre-reloc;
+};
+
+&gpio1 {
+       u-boot,dm-pre-reloc;
+};
+
+&uart1 {
+       u-boot,dm-pre-reloc;
+};
+
+&spi1 {
+       u-boot,dm-pre-reloc;
+};
+
+&I2C0 {
+       u-boot,dm-pre-reloc;
+};
+
+&PCA22 {
+       u-boot,dm-pre-reloc;
+};
+
+#include "mvebu-u-boot.dtsi"

diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index b5d76f8b22d6ce708b85ec6c457e14c95df0164c..79ea6f09095886976b4a9da9a0093ea0c3f6783f 100644 (file)
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -16,18 +16,6 @@
 
 #include "armada-388.dtsi"
 
-&gpio0 {
-       u-boot,dm-pre-reloc;
-};
-
-&gpio1 {
-       u-boot,dm-pre-reloc;
-};
-
-&uart1 {
-       u-boot,dm-pre-reloc;
-};
-
 / {
        model = "Controlcenter Digital Compact";
        compatible = "marvell,a385-db", "marvell,armada388",
@@ -71,7 +59,6 @@
                        I2C0: i2c@11000 {
                                status = "okay";
                                clock-frequency = <1000000>;
-                               u-boot,dm-pre-reloc;
                                PCA21: pca9698@21 {
                                        compatible = "nxp,pca9698";
                                        reg = <0x21>;
@@ -80,7 +67,6 @@
                                };
                                PCA22: pca9698@22 {
                                        compatible = "nxp,pca9698";
-                                       u-boot,dm-pre-reloc;
                                        reg = <0x22>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
@@ -565,7 +551,6 @@
 
 &spi1 {
        status = "okay";
-       u-boot,dm-pre-reloc;
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -579,6 +564,5 @@
                compatible = "n25q128a11", "jedec,spi-nor";
                reg = <1>; /* Chip select 1 */
                spi-max-frequency = <108000000>;
-               u-boot,dm-pre-reloc;
        };
 };