[U-Boot] [PATCH 2/7] ARM: dts: sama5d2_xplained: update for SPL
Wenyou Yang
wenyou.yang at atmel.com
Thu Mar 23 06:26:23 UTC 2017
Add the "u-boot,dm-pre-reloc" property to determine which nodes
which are needed by SPL and by the board_init_f stage.
Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
---
arch/arm/dts/at91-sama5d2_xplained.dts | 12 ++++++++++++
arch/arm/dts/sama5d2.dtsi | 20 ++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 37094376b9..3e624f142c 100644
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -7,6 +7,7 @@
compatible = "atmel,sama5d2-xplained", "atmel,sama5d2", "atmel,sama5";
chosen {
+ u-boot,dm-pre-reloc;
stdout-path = &uart1;
};
@@ -28,6 +29,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_cmd_dat_default &pinctrl_sdmmc0_ck_cd_default>;
status = "okay";
+ u-boot,dm-pre-reloc;
};
sdmmc1: sdio-host at b0000000 {
@@ -35,6 +37,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_cmd_dat_default &pinctrl_sdmmc1_ck_cd_default>;
status = "okay"; /* conflict with qspi0 */
+ u-boot,dm-pre-reloc;
};
apb {
@@ -67,11 +70,13 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0_default>;
status = "okay";
+ u-boot,dm-pre-reloc;
spi_flash at 0 {
compatible = "spi-flash";
reg = <0>;
spi-max-frequency = <50000000>;
+ u-boot,dm-pre-reloc;
};
};
@@ -90,6 +95,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1_default>;
status = "okay";
+ u-boot,dm-pre-reloc;
};
i2c1: i2c at fc028000 {
@@ -146,6 +152,7 @@
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
+ u-boot,dm-pre-reloc;
};
pinctrl_sdmmc0_ck_cd_default: sdmmc0_ck_cd_default {
@@ -154,6 +161,7 @@
<PIN_PA11__SDMMC0_VDDSEL>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
+ u-boot,dm-pre-reloc;
};
pinctrl_sdmmc1_cmd_dat_default: sdmmc1_cmd_dat_default {
@@ -163,12 +171,14 @@
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
+ u-boot,dm-pre-reloc;
};
pinctrl_sdmmc1_ck_cd_default: sdmmc1_ck_cd_default {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
+ u-boot,dm-pre-reloc;
};
pinctrl_spi0_default: spi0_default {
@@ -176,12 +186,14 @@
<PIN_PA15__SPI0_MOSI>,
<PIN_PA16__SPI0_MISO>;
bias-disable;
+ u-boot,dm-pre-reloc;
};
pinctrl_uart1_default: uart1_default {
pinmux = <PIN_PD2__URXD1>,
<PIN_PD3__UTXD1>;
bias-disable;
+ u-boot,dm-pre-reloc;
};
pinctrl_usb_default: usb_default {
diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi
index d976fd4936..8d89b83b53 100644
--- a/arch/arm/dts/sama5d2.dtsi
+++ b/arch/arm/dts/sama5d2.dtsi
@@ -29,6 +29,7 @@
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
+ u-boot,dm-pre-reloc;
usb1: ohci at 00400000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci";
@@ -66,6 +67,7 @@
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
+ u-boot,dm-pre-reloc;
pmc: pmc at f0014000 {
compatible = "atmel,sama5d2-pmc", "syscon";
@@ -73,10 +75,12 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
+ u-boot,dm-pre-reloc;
main: mainck {
compatible = "atmel,at91sam9x5-clk-main";
#clock-cells = <0>;
+ u-boot,dm-pre-reloc;
};
plla: pllack at 0 {
@@ -87,6 +91,7 @@
atmel,clk-input-range = <12000000 12000000>;
#atmel,pll-clk-output-range-cells = <4>;
atmel,pll-clk-output-ranges = <600000000 1200000000 0 0>;
+ u-boot,dm-pre-reloc;
};
plladiv: plladivck {
@@ -117,6 +122,7 @@
compatible = "atmel,at91sam9x5-clk-utmi";
#clock-cells = <0>;
clocks = <&main>;
+ u-boot,dm-pre-reloc;
};
mck: masterck {
@@ -125,12 +131,14 @@
clocks = <&main>, <&plladiv>, <&utmi>;
atmel,clk-output-range = <124000000 166000000>;
atmel,clk-divisors = <1 2 4 3>;
+ u-boot,dm-pre-reloc;
};
h32ck: h32mxck {
#clock-cells = <0>;
compatible = "atmel,sama5d4-clk-h32mx";
clocks = <&mck>;
+ u-boot,dm-pre-reloc;
};
usb: usbck {
@@ -221,6 +229,7 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&h32ck>;
+ u-boot,dm-pre-reloc;
macb0_clk: macb0_clk at 5 {
#clock-cells = <0>;
@@ -248,6 +257,7 @@
#clock-cells = <0>;
reg = <18>;
atmel,clk-output-range = <0 83000000>;
+ u-boot,dm-pre-reloc;
};
flx0_clk: flx0_clk at 19 {
@@ -290,6 +300,7 @@
#clock-cells = <0>;
reg = <25>;
atmel,clk-output-range = <0 83000000>;
+ u-boot,dm-pre-reloc;
};
uart2_clk: uart2_clk at 26 {
@@ -326,6 +337,7 @@
#clock-cells = <0>;
reg = <33>;
atmel,clk-output-range = <0 83000000>;
+ u-boot,dm-pre-reloc;
};
spi1_clk: spi1_clk at 34 {
@@ -430,6 +442,7 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
+ u-boot,dm-pre-reloc;
dma0_clk: dma0_clk at 6 {
#clock-cells = <0>;
@@ -469,11 +482,13 @@
sdmmc0_hclk: sdmmc0_hclk at 31 {
#clock-cells = <0>;
reg = <31>;
+ u-boot,dm-pre-reloc;
};
sdmmc1_hclk: sdmmc1_hclk at 32 {
#clock-cells = <0>;
reg = <32>;
+ u-boot,dm-pre-reloc;
};
lcdc_clk: lcdc_clk at 45 {
@@ -503,15 +518,18 @@
#size-cells = <0>;
interrupt-parent = <&pmc>;
clocks = <&main>, <&plla>, <&utmi>, <&mck>;
+ u-boot,dm-pre-reloc;
sdmmc0_gclk: sdmmc0_gclk at 31 {
#clock-cells = <0>;
reg = <31>;
+ u-boot,dm-pre-reloc;
};
sdmmc1_gclk: sdmmc1_gclk at 32 {
#clock-cells = <0>;
reg = <32>;
+ u-boot,dm-pre-reloc;
};
tcb0_gclk: tcb0_gclk at 35 {
@@ -663,9 +681,11 @@
clocks = <&pioA_clk>;
gpio-controller;
#gpio-cells = <2>;
+ u-boot,dm-pre-reloc;
pinctrl {
compatible = "atmel,sama5d2-pinctrl";
+ u-boot,dm-pre-reloc;
};
};
};
--
2.11.0
More information about the U-Boot
mailing list