From f0498b2be27b04319229c65a71974986662bcfac Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Fri, 10 Feb 2023 18:30:05 +0000 Subject: [PATCH] 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 5ab30c3176bf ("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: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30") Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass Reviewed-by: Kever Yang Reviewed-by: Jagan Teki Tested-by: Jagan Teki # roc-rk3328-cc --- arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 10 ++++++++++ arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 10 ++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 10 ++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi index 3e88ed443b..c5acfe4ac2 100644 --- 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 0859649a69..c5fa2903c5 100644 --- 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 d63c761a02..07f27b2b7b 100644 --- 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 df42bb29ce..d53d3a0fdf 100644 --- 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 -- 2.39.5