ARM: uniphier: split u-boot,dm-pre-reloc out to uniphier-v7-u-boot.dtsi

UniPhier 32-bit SoCs use CONFIG_SPL_OF_CONTROL.  So, many nodes must
be marked as dm-pre-reloc to prevent fdtgrep from stripping them off.

Sprinkling U-Boot-specific properties all over the place is painful
because DT files are synced with Linux from time to time.

Split u-boot,dm-pre-reloc out to uniphier-v7-u-boot.dtsi, which is
appended to UniPhier V7 DTS before the build.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>

diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts
index 0f50acb24c2c2474f334d18520111bf49ecae7e8..0fd66e7b2316b818c01f2702fc1e3a5e82c01b43 100644 (file)
--- a/arch/arm/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ld4-ref.dts
@@ -68,12 +68,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi
index b81603820a828c02ddb9979fd96efebb6af6b221..158beae718e03d70e7db2f0e365630e17e0b22f1 100644 (file)
--- a/arch/arm/dts/uniphier-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ld4.dtsi
@@ -50,7 +50,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -295,11 +294,9 @@
                        compatible = "socionext,uniphier-ld4-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-ld4-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 

diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts
index bdb7f50ab3a045e105e72baa07ff5c597b48f0a0..926d37ee73ca5b1b0ad5821ab42568063aa2e638 100644 (file)
--- a/arch/arm/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ld6b-ref.dts
@@ -70,12 +70,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts
index 8161ba83a0478db1b2d7c30232899ea1a5142899..60a8c337677b442e7df5133234bdea1f5ad84a7b 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/dts/uniphier-pro4-ace.dts
@@ -90,12 +90,3 @@
 &usb3 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts
index 360b31d6927a8994a5bd7aac0334daa026245ead..1b22f80e2ce3b84af5b86e1c3a16fa25306eef18 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-pro4-ref.dts
@@ -83,12 +83,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts
index 778e2bb4b78dc75a4c0cf1a74b70bfef26992bd5..950f47abf8165a9db3443b12b7bf7e37c6806a6d 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/dts/uniphier-pro4-sanji.dts
@@ -85,24 +85,3 @@
 &usb3 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&mio_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 5f39972f67e9d3b11b3c6217696a8c46922c051c..ea97e26c25e93f97d6b32942fe588189d54818bd 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -58,7 +58,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -224,7 +223,6 @@
                        compatible = "socionext,uniphier-pro4-mioctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x59810000 0x800>;
-                       u-boot,dm-pre-reloc;
 
                        mio_clk: clock {
                                compatible = "socionext,uniphier-pro4-mio-clock";
@@ -333,11 +331,9 @@
                        compatible = "socionext,uniphier-pro4-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-pro4-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 

diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts
index 05597d385edc8a786681b4dac9d8a083cac8469c..1986a0be4b6d4ea7e5b1f08568d04c59e81a48d7 100644 (file)
--- a/arch/arm/dts/uniphier-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-pro5-4kbox.dts
@@ -55,12 +55,3 @@
 &sd {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial1 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart1 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi
index 950b02c5b0d78d9f842eaddaa0cc1657b2d2ede7..3be3acf51edaf41e9038793eaba8b314dfaa7c2c 100644 (file)
--- a/arch/arm/dts/uniphier-pro5.dtsi
+++ b/arch/arm/dts/uniphier-pro5.dtsi
@@ -132,7 +132,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -311,7 +310,6 @@
                        compatible = "socionext,uniphier-pro5-sdctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x59810000 0x400>;
-                       u-boot,dm-pre-reloc;
 
                        sd_clk: clock {
                                compatible = "socionext,uniphier-pro5-sd-clock";
@@ -344,11 +342,9 @@
                        compatible = "socionext,uniphier-pro5-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-pro5-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 

diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index 7f0f972bde4f307c5e19df8173d50181131f88a4..4397714e49367773b0965d46fd377db4d7097f0f 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -66,24 +66,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial2 {
-       u-boot,dm-pre-reloc;
-};
-
-&sd_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart2 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts
index ec9ffb7df8b188540db902a60ec3d40900890d22..d29096fc1902434efdbc924730989d883c3333e4 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/dts/uniphier-pxs2-vodka.dts
@@ -49,24 +49,3 @@
 &usb0 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial2 {
-       u-boot,dm-pre-reloc;
-};
-
-&sd_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart2 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi
index ac84d15560bd4e6e4a7160216a0d1dfafb649a92..dcb251597f9a43f6739fa097fc403b391050341a 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/dts/uniphier-pxs2.dtsi
@@ -120,7 +120,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -297,7 +296,6 @@
                        compatible = "socionext,uniphier-pxs2-sdctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x59810000 0x400>;
-                       u-boot,dm-pre-reloc;
 
                        sd_clk: clock {
                                compatible = "socionext,uniphier-pxs2-sd-clock";
@@ -365,11 +363,9 @@
                        compatible = "socionext,uniphier-pxs2-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-pxs2-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 

diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts
index 3557bb7fed57d839253bef7c20ddfd9a5678f5f6..478ee0a6310be9913d66cc31650f9467ed2cc499 100644 (file)
--- a/arch/arm/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-sld8-ref.dts
@@ -72,12 +72,3 @@
 &usb2 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi
index 70a5ea454cc83a21626bbc12a1109bfc5dd002da..a3693b0c1f7c08e9323267aa4dee7fb161ce55c6 100644 (file)
--- a/arch/arm/dts/uniphier-sld8.dtsi
+++ b/arch/arm/dts/uniphier-sld8.dtsi
@@ -50,7 +50,6 @@
                #size-cells = <1>;
                ranges;
                interrupt-parent = <&intc>;
-               u-boot,dm-pre-reloc;
 
                l2: l2-cache@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
@@ -299,11 +298,9 @@
                        compatible = "socionext,uniphier-sld8-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-sld8-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 

diff --git a/arch/arm/dts/uniphier-v7-u-boot.dtsi b/arch/arm/dts/uniphier-v7-u-boot.dtsi
new file mode 100644 (file)
index 0000000..4a0c9c0
--- /dev/null
+++ b/arch/arm/dts/uniphier-v7-u-boot.dtsi
@@ -0,0 +1,61 @@
+/ {
+       soc {
+               u-boot,dm-pre-reloc;
+
+               serial@54006800 {
+                       u-boot,dm-pre-reloc;
+               };
+
+               serial@54006900 {
+                       u-boot,dm-pre-reloc;
+               };
+
+               serial@54006a00 {
+                       u-boot,dm-pre-reloc;
+               };
+
+               mioctrl@59810000 {
+                       u-boot,dm-pre-reloc;
+
+                       clock {
+                               u-boot,dm-pre-reloc;
+                       };
+               };
+
+               sdctrl@59810000 {
+                       u-boot,dm-pre-reloc;
+
+                       clock {
+                               u-boot,dm-pre-reloc;
+                       };
+               };
+
+               soc-glue@5f800000 {
+                       u-boot,dm-pre-reloc;
+
+                       pinctrl {
+                               u-boot,dm-pre-reloc;
+
+                               emmc_grp {
+                                       u-boot,dm-pre-reloc;
+                               };
+
+                               uart0_grp {
+                                       u-boot,dm-pre-reloc;
+                               };
+
+                               uart1_grp {
+                                       u-boot,dm-pre-reloc;
+                               };
+
+                               uart2_grp {
+                                       u-boot,dm-pre-reloc;
+                               };
+                       };
+               };
+       };
+};
+
+&emmc {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index de3bdc0bc2fc4a0d8e7db61458f59ebcdf3c41c9..cc759b3e01dc0cc41bddcd19f7bc063caa9aeb3d 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -117,4 +117,6 @@ config CMD_DDRMPHY_DUMP
          The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
          training; it is useful for the evaluation of DDR Multi PHY training.
 
+config SYS_SOC
+       default "uniphier-v7" if ARCH_UNIPHIER_LD4_SLD8 || ARCH_UNIPHIER_V7_MULTI
 endif