rockchip: dts: rk3328: fix sdram params

The rk3328 sdram driver read sdram parameters from the devicetree into a
struct rk3328_sdram_params using dev_read_u32_array.

After commit 5c8da345e55c ("ram: rockchip: Update ddr pctl regs for px30")
changed the size of struct ddr_pctl_regs, a member of struct
rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.

Add ten u32 to the sdram parameter array in devicetree to align with
this size change. This fixes DRAM initialization on RK3328.

Fixes: 5c8da345e55c ("ram: rockchip: Update ddr pctl regs for px30")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com> # roc-rk3328-cc

diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
index 3e88ed443ba04cebd19e6546c926829cb33beddc..c5acfe4ac2a0e9a79fef7e7cb7350bce536607dc 100644 (file)
--- a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
+++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
@@ -92,6 +92,16 @@
                0xffffffff
                0xffffffff
                0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
 
                0x00000004
                0x0000000a

diff --git a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
index 0859649a690566504bbdbc40ab6cc7ac2e7cc49d..c5fa2903c5c140068f44cdf886368735497090c1 100644 (file)
--- a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
+++ b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
@@ -89,6 +89,16 @@
                0xffffffff
                0xffffffff
                0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
 
                0x00000004
                0x0000000c

diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
index d63c761a0283e25301d40ec0f7a6d0c5be2da48c..07f27b2b7bab8025d76d7052319bf1dda4ca74ab 100644 (file)
--- a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
+++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
@@ -92,6 +92,16 @@
                0xffffffff
                0xffffffff
                0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
 
                0x00000004
                0x0000000b

diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
index df42bb29ce888d7fe118225219dc175a03339706..d53d3a0fdfb24323f665ddab5252353a55a3917b 100644 (file)
--- a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
+++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
@@ -92,6 +92,16 @@
                0xffffffff
                0xffffffff
                0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
+               0xffffffff
 
                0x00000004
                0x0000000b