diff --git a/target/linux/rockchip/patches-6.1/013-v6.4-arm64-dts-rockchip-Fix-rk356x-PCIe-register-and-range-map.patch b/target/linux/rockchip/patches-6.1/013-v6.4-arm64-dts-rockchip-Fix-rk356x-PCIe-register-and-range-map.patch deleted file mode 100644 index 560693923a..0000000000 --- a/target/linux/rockchip/patches-6.1/013-v6.4-arm64-dts-rockchip-Fix-rk356x-PCIe-register-and-range-map.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 568a67e742dfa90b19a23305317164c5c350b71e Mon Sep 17 00:00:00 2001 -From: Andrew Powers-Holmes -Date: Thu, 1 Jun 2023 15:25:16 +0200 -Subject: [PATCH] arm64: dts: rockchip: Fix rk356x PCIe register and range mappings - -The register and range mappings for the PCIe controller in Rockchip's -RK356x SoCs are incorrect. Replace them with corrected values from the -vendor BSP sources, updated to match current DT schema. - -These values are also used in u-boot. - -Fixes: 66b51ea7d70f ("arm64: dts: rockchip: Add rk3568 PCIe2x1 controller") -Cc: stable@vger.kernel.org -Signed-off-by: Andrew Powers-Holmes -Signed-off-by: Jonas Karlman -Signed-off-by: Nicolas Frattaroli -Tested-by: Diederik de Haas -Link: https://lore.kernel.org/r/20230601132516.153934-1-frattaroli.nicolas@gmail.com -Signed-off-by: Heiko Stuebner ---- - arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 ++++++++------ - arch/arm64/boot/dts/rockchip/rk356x.dtsi | 7 ++++--- - 2 files changed, 12 insertions(+), 9 deletions(-) - ---- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -@@ -94,9 +94,10 @@ - power-domains = <&power RK3568_PD_PIPE>; - reg = <0x3 0xc0400000 0x0 0x00400000>, - <0x0 0xfe270000 0x0 0x00010000>, -- <0x3 0x7f000000 0x0 0x01000000>; -- ranges = <0x01000000 0x0 0x3ef00000 0x3 0x7ef00000 0x0 0x00100000>, -- <0x02000000 0x0 0x00000000 0x3 0x40000000 0x0 0x3ef00000>; -+ <0x0 0xf2000000 0x0 0x00100000>; -+ ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>, -+ <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>, -+ <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>; - reg-names = "dbi", "apb", "config"; - resets = <&cru SRST_PCIE30X1_POWERUP>; - reset-names = "pipe"; -@@ -146,9 +147,10 @@ - power-domains = <&power RK3568_PD_PIPE>; - reg = <0x3 0xc0800000 0x0 0x00400000>, - <0x0 0xfe280000 0x0 0x00010000>, -- <0x3 0xbf000000 0x0 0x01000000>; -- ranges = <0x01000000 0x0 0x3ef00000 0x3 0xbef00000 0x0 0x00100000>, -- <0x02000000 0x0 0x00000000 0x3 0x80000000 0x0 0x3ef00000>; -+ <0x0 0xf0000000 0x0 0x00100000>; -+ ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>, -+ <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>, -+ <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>; - reg-names = "dbi", "apb", "config"; - resets = <&cru SRST_PCIE30X2_POWERUP>; - reset-names = "pipe"; ---- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -@@ -951,7 +951,7 @@ - compatible = "rockchip,rk3568-pcie"; - reg = <0x3 0xc0000000 0x0 0x00400000>, - <0x0 0xfe260000 0x0 0x00010000>, -- <0x3 0x3f000000 0x0 0x01000000>; -+ <0x0 0xf4000000 0x0 0x00100000>; - reg-names = "dbi", "apb", "config"; - interrupts = , - , -@@ -981,8 +981,9 @@ - phys = <&combphy2 PHY_TYPE_PCIE>; - phy-names = "pcie-phy"; - power-domains = <&power RK3568_PD_PIPE>; -- ranges = <0x01000000 0x0 0x3ef00000 0x3 0x3ef00000 0x0 0x00100000 -- 0x02000000 0x0 0x00000000 0x3 0x00000000 0x0 0x3ef00000>; -+ ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>, -+ <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>, -+ <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>; - resets = <&cru SRST_PCIE20_POWERUP>; - reset-names = "pipe"; - #address-cells = <3>; diff --git a/target/linux/rockchip/patches-6.1/601-net-phy-motorcomm-add-LED-configuration-for-yt8521.patch b/target/linux/rockchip/patches-6.1/601-net-phy-motorcomm-add-LED-configuration-for-yt8521.patch index 2e16482c0d..6573d11b2c 100644 --- a/target/linux/rockchip/patches-6.1/601-net-phy-motorcomm-add-LED-configuration-for-yt8521.patch +++ b/target/linux/rockchip/patches-6.1/601-net-phy-motorcomm-add-LED-configuration-for-yt8521.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/motorcomm.c +++ b/drivers/net/phy/motorcomm.c -@@ -1487,6 +1487,13 @@ static int yt8521_config_init(struct phy +@@ -1488,6 +1488,13 @@ static int yt8521_config_init(struct phy if (ret < 0) goto err_restore_page; }