| Message ID | 20191110125739.20926-1-michael@amarulasolutions.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [U-Boot,1/2] rockchip: dts: tinker: Move u-boot dmc initialization to specific section | expand |
On 2019/11/10 下午8:57, Michael Trimarchi wrote: > dmc is used to initialize the memory controller. It's needed by > u-boot. Move it in the specific section > > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3288-tinker-u-boot.dtsi | 12 ++++++++++++ > arch/arm/dts/rk3288-tinker.dts | 12 ------------ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > index f7f9d6dc72..732aa4f91f 100644 > --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi > +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi > @@ -5,6 +5,18 @@ > > #include "rk3288-u-boot.dtsi" > > +&dmc { > + u-boot,dm-pre-reloc; > + rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d > + 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 > + 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 > + 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 > + 0x8 0x1f4>; > + rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 > + 0x0 0xc3 0x6 0x2>; > + rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; > +}; > + > &pinctrl { > u-boot,dm-pre-reloc; > }; > diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts > index 94c3afe860..4b8405fd82 100644 > --- a/arch/arm/dts/rk3288-tinker.dts > +++ b/arch/arm/dts/rk3288-tinker.dts > @@ -15,18 +15,6 @@ > }; > }; > > -&dmc { > - rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d > - 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 > - 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 > - 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 > - 0x8 0x1f4>; > - rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 > - 0x0 0xc3 0x6 0x2>; > - rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; > -}; > - > - > &pinctrl { > usb { > host_vbus_drv: host-vbus-drv {
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index f7f9d6dc72..732aa4f91f 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -5,6 +5,18 @@ #include "rk3288-u-boot.dtsi" +&dmc { + u-boot,dm-pre-reloc; + rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d + 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 + 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 + 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 + 0x8 0x1f4>; + rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 + 0x0 0xc3 0x6 0x2>; + rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; +}; + &pinctrl { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 94c3afe860..4b8405fd82 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -15,18 +15,6 @@ }; }; -&dmc { - rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d - 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 - 0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0 - 0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4 - 0x8 0x1f4>; - rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076 - 0x0 0xc3 0x6 0x2>; - rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; -}; - - &pinctrl { usb { host_vbus_drv: host-vbus-drv {
dmc is used to initialize the memory controller. It's needed by u-boot. Move it in the specific section Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> --- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 12 ++++++++++++ arch/arm/dts/rk3288-tinker.dts | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-)