From 347559c17affde62dc93c95cc1e67135f3b14acc Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Sun, 14 Aug 2022 23:35:01 +0800 Subject: [PATCH] kernel: refresh 5.19 patch (#9943) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- ...s-rockchip-add-hardware-random-number-genera.patch | 8 ++++---- .../patches-5.19/0105-nanopi-r4s-sd-signalling.patch | 2 +- ...0800-rockchip-snps-pcie3-update-fw-when-init.patch | 11 +++-------- .../patches-5.19/0900-arm-boot-add-dts-files.patch | 3 ++- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/target/linux/rockchip/patches-5.19/0057-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/target/linux/rockchip/patches-5.19/0057-arm64-dts-rockchip-add-hardware-random-number-genera.patch index 5e47bc23e..6c0b15849 100644 --- a/target/linux/rockchip/patches-5.19/0057-arm64-dts-rockchip-add-hardware-random-number-genera.patch +++ b/target/linux/rockchip/patches-5.19/0057-arm64-dts-rockchip-add-hardware-random-number-genera.patch @@ -31,7 +31,7 @@ Signed-off-by: wevsty reg = <0x0 0xff100000 0x0 0x1000>; --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -1937,6 +1937,16 @@ +@@ -2042,6 +2042,16 @@ }; }; @@ -48,9 +48,9 @@ Signed-off-by: wevsty gpu: gpu@ff9a0000 { compatible = "rockchip,rk3399-mali", "arm,mali-t860"; reg = <0x0 0xff9a0000 0x0 0x10000>; ---- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi 2022-08-09 00:09:02.289032224 +0800 -+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi 2022-08-09 00:11:01.829992919 +0800 -@@ -89,6 +89,16 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi +@@ -211,6 +211,16 @@ }; }; diff --git a/target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch index 306568729..a04c14b70 100644 --- a/target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch +++ b/target/linux/rockchip/patches-5.19/0105-nanopi-r4s-sd-signalling.patch @@ -12,7 +12,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -137,6 +137,11 @@ +@@ -121,6 +121,11 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.19/0800-rockchip-snps-pcie3-update-fw-when-init.patch b/target/linux/rockchip/patches-5.19/0800-rockchip-snps-pcie3-update-fw-when-init.patch index d87ffda23..bfc2d73ab 100644 --- a/target/linux/rockchip/patches-5.19/0800-rockchip-snps-pcie3-update-fw-when-init.patch +++ b/target/linux/rockchip/patches-5.19/0800-rockchip-snps-pcie3-update-fw-when-init.patch @@ -11,9 +11,6 @@ Signed-off-by: jensen 2 files changed, 8220 insertions(+), 9 deletions(-) create mode 100644 drivers/phy/rockchip/p3phy.fw -diff --git a/drivers/phy/rockchip/p3phy.fw b/drivers/phy/rockchip/p3phy.fw -new file mode 100644 -index 0000000000000..301c42837ad94 --- /dev/null +++ b/drivers/phy/rockchip/p3phy.fw @@ -0,0 +1,8192 @@ @@ -8209,8 +8206,6 @@ index 0000000000000..301c42837ad94 +0x0000, +0x0000, +0x0000 -diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c -index bb5fed0c03caf..53c4890f7391d 100644 --- a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c @@ -20,6 +20,7 @@ @@ -8221,7 +8216,7 @@ index bb5fed0c03caf..53c4890f7391d 100644 #define GRF_PCIE30PHY_CON6 0x18 #define GRF_PCIE30PHY_CON9 0x24 #define GRF_PCIE30PHY_STATUS0 0x80 -@@ -61,6 +62,10 @@ +@@ -61,6 +62,10 @@ struct rockchip_p3phy_ops { int (*phy_init)(struct rockchip_p3phy_priv *priv); }; @@ -8232,7 +8227,7 @@ index bb5fed0c03caf..53c4890f7391d 100644 static int rockchip_p3phy_set_mode(struct phy *phy, enum phy_mode mode, int submode) { struct rockchip_p3phy_priv *priv = phy_get_drvdata(phy); -@@ -86,6 +91,7 @@ +@@ -86,6 +91,7 @@ static int rockchip_p3phy_rk3568_init(st struct phy *phy = priv->phy; bool bifurcation = false; int ret; @@ -8240,7 +8235,7 @@ index bb5fed0c03caf..53c4890f7391d 100644 u32 reg; /* Deassert PCIe PMA output clamp mode */ -@@ -110,16 +116,35 @@ +@@ -110,16 +116,35 @@ static int rockchip_p3phy_rk3568_init(st (0xf << 16) & ~RK3568_BIFURCATION_LANE_0_1); } diff --git a/target/linux/rockchip/patches-5.19/0900-arm-boot-add-dts-files.patch b/target/linux/rockchip/patches-5.19/0900-arm-boot-add-dts-files.patch index 62d6b449f..1f8da04c0 100644 --- a/target/linux/rockchip/patches-5.19/0900-arm-boot-add-dts-files.patch +++ b/target/linux/rockchip/patches-5.19/0900-arm-boot-add-dts-files.patch @@ -32,10 +32,11 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb -@@ -65,4 +65,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-ro +@@ -66,5 +75,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-ro dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-r66s.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-station-p2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb