WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit b7f547b

Browse files
committed
rockchip64: rewrite patches
1 parent 264498c commit b7f547b

10 files changed

+14
-14
lines changed

patch/kernel/archive/rockchip64-6.18/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot
1414
index 111111111111..222222222222 100644
1515
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
1616
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
17-
@@ -739,3 +739,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
17+
@@ -741,3 +741,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
1818
remote-endpoint = <&hdmi_in_vp0>;
1919
};
2020
};

patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Subject: Add sata node for Orange-Pi-5's overlay (#8707)
1818
> X-Git-Archeology: Subject: rockchip64-6.18: update patches
1919
> X-Git-Archeology:
2020
---
21-
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 11 ++++++++--
22-
1 file changed, 9 insertions(+), 2 deletions(-)
21+
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 7 +++++++
22+
1 file changed, 7 insertions(+)
2323

2424
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
2525
index 111111111111..222222222222 100644

patch/kernel/archive/rockchip64-6.18/general-rk3328-dtsi-trb-ent-quirk.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
4848
index 111111111111..222222222222 100644
4949
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
5050
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
51-
@@ -1105,6 +1105,7 @@ usbdrd3: usb@ff600000 {
51+
@@ -1104,6 +1104,7 @@ usbdrd3: usb@ff600000 {
5252
snps,dis-del-phy-power-chg-quirk;
5353
snps,dis_enblslpm_quirk;
5454
snps,dis-tx-ipgap-linecheck-quirk;

patch/kernel/archive/rockchip64-6.18/general-v4l2-iep-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
186186
index 111111111111..222222222222 100644
187187
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
188188
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
189-
@@ -785,6 +785,28 @@ vop_mmu: iommu@ff373f00 {
189+
@@ -784,6 +784,28 @@ vop_mmu: iommu@ff373f00 {
190190
status = "disabled";
191191
};
192192

patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,7 +3907,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rock
39073907
index 111111111111..222222222222 100644
39083908
--- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi
39093909
+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
3910-
@@ -1289,6 +1289,41 @@ gpu: gpu@27800000 {
3910+
@@ -1277,6 +1277,41 @@ gpu: gpu@27800000 {
39113911
status = "disabled";
39123912
};
39133913

@@ -3949,7 +3949,7 @@ index 111111111111..222222222222 100644
39493949
vop: vop@27d00000 {
39503950
compatible = "rockchip,rk3576-vop";
39513951
reg = <0x0 0x27d00000 0x0 0x3000>, <0x0 0x27d05000 0x0 0x1000>;
3952-
@@ -2694,6 +2729,7 @@ sram: sram@3ff88000 {
3952+
@@ -2680,6 +2715,7 @@ sram: sram@3ff88000 {
39533953
/* start address and size should be 4k align */
39543954
rkvdec_sram: rkvdec-sram@0 {
39553955
reg = <0x0 0x78000>;

patch/kernel/archive/rockchip64-6.18/rk3328-add-dmc-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
341341
index 111111111111..222222222222 100644
342342
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
343343
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
344-
@@ -604,6 +604,67 @@ tsadc: tsadc@ff250000 {
344+
@@ -603,6 +603,67 @@ tsadc: tsadc@ff250000 {
345345
status = "disabled";
346346
};
347347

patch/kernel/archive/rockchip64-6.18/rk3328-add-rga-node.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
1111
index 111111111111..222222222222 100644
1212
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
1313
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
14-
@@ -846,6 +846,20 @@ vop_mmu: iommu@ff373f00 {
14+
@@ -845,6 +845,20 @@ vop_mmu: iommu@ff373f00 {
1515
status = "disabled";
1616
};
1717

patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-spdif.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ index 111111111111..222222222222 100644
8888
timer {
8989
compatible = "arm,armv8-timer";
9090
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
91-
@@ -973,6 +993,7 @@ cru: clock-controller@ff440000 {
91+
@@ -972,6 +992,7 @@ cru: clock-controller@ff440000 {
9292
<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
9393
<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
9494
<&cru HCLK_PERI>, <&cru PCLK_PERI>,
9595
+ <&cru ACLK_GPU>,
9696
<&cru SCLK_RTC32K>;
9797
assigned-clock-parents =
9898
<&cru HDMIPHY>, <&cru PLL_APLL>,
99-
@@ -994,6 +1015,7 @@ cru: clock-controller@ff440000 {
99+
@@ -993,6 +1014,7 @@ cru: clock-controller@ff440000 {
100100
<150000000>, <75000000>,
101101
<75000000>, <150000000>,
102102
<75000000>, <75000000>,

patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-usb3-reset-properties.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
1111
index 111111111111..222222222222 100644
1212
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
1313
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
14-
@@ -1219,6 +1219,8 @@ usbdrd3: usb@ff600000 {
14+
@@ -1218,6 +1218,8 @@ usbdrd3: usb@ff600000 {
1515
<&cru ACLK_USB3OTG>;
1616
clock-names = "ref_clk", "suspend_clk",
1717
"bus_clk";

patch/kernel/archive/rockchip64-6.18/rk3328-inno-usb3phy-driver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
188188
index 111111111111..222222222222 100644
189189
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
190190
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
191-
@@ -1056,6 +1056,43 @@ u2phy_host: host-port {
191+
@@ -1055,6 +1055,43 @@ u2phy_host: host-port {
192192
};
193193
};
194194

@@ -232,7 +232,7 @@ index 111111111111..222222222222 100644
232232
sdmmc: mmc@ff500000 {
233233
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
234234
reg = <0x0 0xff500000 0x0 0x4000>;
235-
@@ -1222,6 +1259,8 @@ usbdrd3: usb@ff600000 {
235+
@@ -1221,6 +1258,8 @@ usbdrd3: usb@ff600000 {
236236
resets = <&cru SRST_USB3OTG>;
237237
reset-names = "usb3-otg";
238238
dr_mode = "otg";

0 commit comments

Comments
 (0)