diff --git a/target/linux/rockchip/patches-5.15/805-arm64-dts-rockchip-add-rk3328-ddr-relate-node.patch b/target/linux/rockchip/patches-5.15/805-arm64-dts-rockchip-add-rk3328-ddr-relate-node.patch index bcc3c4d85a..fd5d39ca3d 100644 --- a/target/linux/rockchip/patches-5.15/805-arm64-dts-rockchip-add-rk3328-ddr-relate-node.patch +++ b/target/linux/rockchip/patches-5.15/805-arm64-dts-rockchip-add-rk3328-ddr-relate-node.patch @@ -36,7 +36,7 @@ Signed-off-by: hmz007 + reg = <0x00 0xff790000 0x00 0x400>; + compatible = "rockchip,rk3328-dfi"; + rockchip,grf = <&grf>; -+ status = "disabled"; ++ status = "okay"; + }; + + dmc: dmc { diff --git a/target/linux/rockchip/patches-5.15/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch b/target/linux/rockchip/patches-5.15/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch index d84ac8a2c4..73c81817e5 100644 --- a/target/linux/rockchip/patches-5.15/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch +++ b/target/linux/rockchip/patches-5.15/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch @@ -16,15 +16,7 @@ Signed-off-by: hmz007 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -137,10 +137,19 @@ - cpu-supply = <&vdd_arm>; - }; - -+&dfi { -+ status = "okay"; -+}; -+ - &display_subsystem { +@@ -141,6 +141,11 @@ status = "disabled"; }; @@ -36,7 +28,7 @@ Signed-off-by: hmz007 &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; -@@ -206,6 +215,7 @@ +@@ -206,6 +211,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -44,7 +36,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -220,6 +230,7 @@ +@@ -220,6 +226,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; @@ -54,15 +46,7 @@ Signed-off-by: hmz007 regulator-ramp-delay = <12500>; --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -@@ -104,10 +104,19 @@ - cpu-supply = <&vdd_arm>; - }; - -+&dfi { -+ status = "okay"; -+}; -+ - &display_subsystem { +@@ -108,6 +108,11 @@ status = "disabled"; }; @@ -74,7 +58,7 @@ Signed-off-by: hmz007 &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; -@@ -167,6 +176,7 @@ +@@ -167,6 +172,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -82,7 +66,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -181,6 +191,7 @@ +@@ -181,6 +187,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; @@ -116,7 +100,7 @@ Signed-off-by: hmz007 tx_delay = <0x19>; --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -@@ -134,6 +134,68 @@ +@@ -134,6 +134,64 @@ cpu-supply = <&vdd_arm>; }; @@ -153,10 +137,6 @@ Signed-off-by: hmz007 + ddr3odt1_ddr4odt1_de-skew = <0>; +}; + -+&dfi { -+ status = "okay"; -+}; -+ +&dmc { + center-supply = <&vdd_logic>; + status = "okay"; @@ -185,7 +165,7 @@ Signed-off-by: hmz007 &emmc { bus-width = <8>; cap-mmc-highspeed; -@@ -206,6 +268,7 @@ +@@ -206,6 +264,7 @@ regulators { vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; @@ -193,7 +173,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-always-on; -@@ -218,6 +281,7 @@ +@@ -218,6 +277,7 @@ vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; @@ -203,14 +183,10 @@ Signed-off-by: hmz007 regulator-always-on; --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -@@ -133,6 +133,15 @@ +@@ -133,6 +133,11 @@ cpu-supply = <&vdd_arm>; }; -+&dfi { -+ status = "okay"; -+}; -+ +&dmc { + center-supply = <&vdd_log>; + status = "okay"; @@ -219,7 +195,7 @@ Signed-off-by: hmz007 &emmc { bus-width = <8>; cap-mmc-highspeed; -@@ -213,6 +222,7 @@ +@@ -213,6 +218,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -227,7 +203,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -227,6 +237,7 @@ +@@ -227,6 +233,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on;