qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rockchip64-6.13: rebase patches against 6.13-rc7

This commit is contained in:
Ricardo Pardini 2025-01-19 22:46:42 +01:00 committed by Igor
parent b86cc380e5
commit 1a622e5fa7
11 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/rockchip64-6.13/general-rk3328-dtsi-trb-ent-quirk.patch
View File

@ -48,7 +48,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1070,6 +1070,7 @@ usbdrd3: usb@ff600000 {
@@ -1071,6 +1071,7 @@ usbdrd3: usb@ff600000 {
snps,dis-del-phy-power-chg-quirk;
snps,dis_enblslpm_quirk;
snps,dis-tx-ipgap-linecheck-quirk;

2
patch/kernel/archive/rockchip64-6.13/general-v4l2-iep-driver.patch
View File

@ -186,7 +186,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -750,6 +750,28 @@ vop_mmu: iommu@ff373f00 {
@@ -751,6 +751,28 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

2
patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-01-vp9.patch
View File

@ -474,7 +474,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -704,6 +704,11 @@ vdec: video-codec@ff360000 {
@@ -705,6 +705,11 @@ vdec: video-codec@ff360000 {
assigned-clocks = <&cru ACLK_RKVDEC>, <&cru SCLK_VDEC_CABAC>,
<&cru SCLK_VDEC_CORE>;
assigned-clock-rates = <400000000>, <400000000>, <300000000>;

2
patch/kernel/archive/rockchip64-6.13/rk3328-add-dmc-driver.patch
View File

@ -341,7 +341,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -594,6 +594,67 @@ tsadc: tsadc@ff250000 {
@@ -595,6 +595,67 @@ tsadc: tsadc@ff250000 {
status = "disabled";
};

2
patch/kernel/archive/rockchip64-6.13/rk3328-add-rga-node.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -816,6 +816,20 @@ vop_mmu: iommu@ff373f00 {
@@ -817,6 +817,20 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

2
patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-mali-opp-table.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -712,6 +712,31 @@ gpu: gpu@ff300000 {
@@ -713,6 +713,31 @@ gpu: gpu@ff300000 {
clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
clock-names = "bus", "core";
resets = <&cru SRST_GPU_A>;

8
patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-spdif.patch
View File

@ -98,8 +98,8 @@ index 111111111111..222222222222 100644
+ };
power-domain@RK3328_PD_HEVC {
reg = <RK3328_PD_HEVC>;
#power-domain-cells = <0>;
@@ -711,6 +735,7 @@ gpu: gpu@ff300000 {
clocks = <&cru SCLK_VENC_CORE>;
@@ -712,6 +736,7 @@ gpu: gpu@ff300000 {
"ppmmu1";
clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
clock-names = "bus", "core";
@ -107,7 +107,7 @@ index 111111111111..222222222222 100644
resets = <&cru SRST_GPU_A>;
operating-points-v2 = <&gpu_opp_table>;
};
@@ -968,6 +993,7 @@ cru: clock-controller@ff440000 {
@@ -969,6 +994,7 @@ cru: clock-controller@ff440000 {
<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
<&cru HCLK_PERI>, <&cru PCLK_PERI>,
@ -115,7 +115,7 @@ index 111111111111..222222222222 100644
<&cru SCLK_RTC32K>;
assigned-clock-parents =
<&cru HDMIPHY>, <&cru PLL_APLL>,
@@ -989,6 +1015,7 @@ cru: clock-controller@ff440000 {
@@ -990,6 +1016,7 @@ cru: clock-controller@ff440000 {
<150000000>, <75000000>,
<75000000>, <150000000>,
<75000000>, <75000000>,

2
patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-usb3-reset-properties.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1219,6 +1219,8 @@ usbdrd3: usb@ff600000 {
@@ -1220,6 +1220,8 @@ usbdrd3: usb@ff600000 {
<&cru ACLK_USB3OTG>;
clock-names = "ref_clk", "suspend_clk",
"bus_clk";

4
patch/kernel/archive/rockchip64-6.13/rk3328-gpu-cooling-target.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -593,6 +593,11 @@ map0 {
@@ -594,6 +594,11 @@ map0 {
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
contribution = <4096>;
};
@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
};
};
@@ -738,6 +743,7 @@ gpu: gpu@ff300000 {
@@ -739,6 +744,7 @@ gpu: gpu@ff300000 {
power-domains = <&power RK3328_PD_GPU>;
resets = <&cru SRST_GPU_A>;
operating-points-v2 = <&gpu_opp_table>;

4
patch/kernel/archive/rockchip64-6.13/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
View File

@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/bo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
@@ -774,6 +774,15 @@ &tsadc {
@@ -775,6 +775,15 @@ &tsadc {
status = "okay";
};
@ -27,7 +27,7 @@ index 111111111111..222222222222 100644
&u2phy2 {
status = "okay";
};
@@ -796,6 +805,16 @@ &usb_host0_ohci {
@@ -797,6 +806,16 @@ &usb_host0_ohci {
status = "okay";
};

16
patch/kernel/archive/rockchip64-6.13/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch
View File

@ -9,12 +9,10 @@ Signed-off-by: Tim Surber <me@timsurber.de>
1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
index b3a04ca370bb..6e79aba4c6a0 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
@@ -99,10 +99,17 @@ hdmi0_con_in: endpoint {
remote-endpoint = <&hdmi0_out_con>;
};
@@ -101,6 +101,13 @@ hdmi0_con_in: endpoint {
};
};
@ -28,11 +26,7 @@ index b3a04ca370bb..6e79aba4c6a0 100644
ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>;
};
@@ -476,10 +483,17 @@ gpio-key {
key1_pin: key1-pin {
rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -478,6 +485,13 @@ key1_pin: key1-pin {
};
};
@ -46,8 +40,6 @@ index b3a04ca370bb..6e79aba4c6a0 100644
pcie {
pcie2_0_rst: pcie2-0-rst {
rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian