GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2017-10-17 21:19:42 +09:00
parent d0df9588e8
commit 9ac0e7b37a
16 changed files with 63 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/dts/uniphier-ld4-ref.dts
View file

@ -68,12 +68,3 @@
&usb1 { &usb1 {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart0 {
u-boot,dm-pre-reloc;
};

3
arch/arm/dts/uniphier-ld4.dtsi
View file

@ -50,7 +50,6 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
u-boot,dm-pre-reloc;
l2: l2-cache@500c0000 { l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache"; compatible = "socionext,uniphier-system-cache";
@ -295,11 +294,9 @@
compatible = "socionext,uniphier-ld4-soc-glue", compatible = "socionext,uniphier-ld4-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
u-boot,dm-pre-reloc;
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "socionext,uniphier-ld4-pinctrl"; compatible = "socionext,uniphier-ld4-pinctrl";
u-boot,dm-pre-reloc;
}; };
}; };

9
arch/arm/dts/uniphier-ld6b-ref.dts
View file

@ -70,12 +70,3 @@
&usb1 { &usb1 {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart0 {
u-boot,dm-pre-reloc;
};

9
arch/arm/dts/uniphier-pro4-ace.dts
View file

@ -90,12 +90,3 @@
&usb3 { &usb3 {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart0 {
u-boot,dm-pre-reloc;
};

9
arch/arm/dts/uniphier-pro4-ref.dts
View file

@ -83,12 +83,3 @@
&usb1 { &usb1 {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart0 {
u-boot,dm-pre-reloc;
};

21
arch/arm/dts/uniphier-pro4-sanji.dts
View file

@ -85,24 +85,3 @@
&usb3 { &usb3 {
status = "okay"; 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;
};

4
arch/arm/dts/uniphier-pro4.dtsi
View file

@ -58,7 +58,6 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
u-boot,dm-pre-reloc;
l2: l2-cache@500c0000 { l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache"; compatible = "socionext,uniphier-system-cache";
@ -224,7 +223,6 @@
compatible = "socionext,uniphier-pro4-mioctrl", compatible = "socionext,uniphier-pro4-mioctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x59810000 0x800>; reg = <0x59810000 0x800>;
u-boot,dm-pre-reloc;
mio_clk: clock { mio_clk: clock {
compatible = "socionext,uniphier-pro4-mio-clock"; compatible = "socionext,uniphier-pro4-mio-clock";
@ -333,11 +331,9 @@
compatible = "socionext,uniphier-pro4-soc-glue", compatible = "socionext,uniphier-pro4-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
u-boot,dm-pre-reloc;
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "socionext,uniphier-pro4-pinctrl"; compatible = "socionext,uniphier-pro4-pinctrl";
u-boot,dm-pre-reloc;
}; };
}; };

9
arch/arm/dts/uniphier-pro5-4kbox.dts
View file

@ -55,12 +55,3 @@
&sd { &sd {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial1 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart1 {
u-boot,dm-pre-reloc;
};

4
arch/arm/dts/uniphier-pro5.dtsi
View file

@ -132,7 +132,6 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
u-boot,dm-pre-reloc;
l2: l2-cache@500c0000 { l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache"; compatible = "socionext,uniphier-system-cache";
@ -311,7 +310,6 @@
compatible = "socionext,uniphier-pro5-sdctrl", compatible = "socionext,uniphier-pro5-sdctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x59810000 0x400>; reg = <0x59810000 0x400>;
u-boot,dm-pre-reloc;
sd_clk: clock { sd_clk: clock {
compatible = "socionext,uniphier-pro5-sd-clock"; compatible = "socionext,uniphier-pro5-sd-clock";
@ -344,11 +342,9 @@
compatible = "socionext,uniphier-pro5-soc-glue", compatible = "socionext,uniphier-pro5-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
u-boot,dm-pre-reloc;
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "socionext,uniphier-pro5-pinctrl"; compatible = "socionext,uniphier-pro5-pinctrl";
u-boot,dm-pre-reloc;
}; };
}; };

21
arch/arm/dts/uniphier-pxs2-gentil.dts
View file

@ -66,24 +66,3 @@
&usb1 { &usb1 {
status = "okay"; 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;
};

21
arch/arm/dts/uniphier-pxs2-vodka.dts
View file

@ -49,24 +49,3 @@
&usb0 { &usb0 {
status = "okay"; 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;
};

4
arch/arm/dts/uniphier-pxs2.dtsi
View file

@ -120,7 +120,6 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
u-boot,dm-pre-reloc;
l2: l2-cache@500c0000 { l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache"; compatible = "socionext,uniphier-system-cache";
@ -297,7 +296,6 @@
compatible = "socionext,uniphier-pxs2-sdctrl", compatible = "socionext,uniphier-pxs2-sdctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x59810000 0x400>; reg = <0x59810000 0x400>;
u-boot,dm-pre-reloc;
sd_clk: clock { sd_clk: clock {
compatible = "socionext,uniphier-pxs2-sd-clock"; compatible = "socionext,uniphier-pxs2-sd-clock";
@ -365,11 +363,9 @@
compatible = "socionext,uniphier-pxs2-soc-glue", compatible = "socionext,uniphier-pxs2-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
u-boot,dm-pre-reloc;
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "socionext,uniphier-pxs2-pinctrl"; compatible = "socionext,uniphier-pxs2-pinctrl";
u-boot,dm-pre-reloc;
}; };
}; };

9
arch/arm/dts/uniphier-sld8-ref.dts
View file

@ -72,12 +72,3 @@
&usb2 { &usb2 {
status = "okay"; status = "okay";
}; };
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};
&pinctrl_uart0 {
u-boot,dm-pre-reloc;
};

3
arch/arm/dts/uniphier-sld8.dtsi
View file

@ -50,7 +50,6 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
u-boot,dm-pre-reloc;
l2: l2-cache@500c0000 { l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache"; compatible = "socionext,uniphier-system-cache";
@ -299,11 +298,9 @@
compatible = "socionext,uniphier-sld8-soc-glue", compatible = "socionext,uniphier-sld8-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
u-boot,dm-pre-reloc;
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "socionext,uniphier-sld8-pinctrl"; compatible = "socionext,uniphier-sld8-pinctrl";
u-boot,dm-pre-reloc;
}; };
}; };

61
arch/arm/dts/uniphier-v7-u-boot.dtsi Normal file
View file

@ -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;
};

2
arch/arm/mach-uniphier/Kconfig
View file

@ -117,4 +117,6 @@ config CMD_DDRMPHY_DUMP
The command "ddrmphy" shows the resulting parameters of DDR Multi PHY The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
training; it is useful for the evaluation of DDR Multi PHY training. 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 endif