rockchip64: rewrite patches

This commit is contained in:
EvilOlaf 2025-11-24 19:14:15 +00:00 committed by Igor
parent cdfcd88dba
commit 6aa78282e2
10 changed files with 14 additions and 14 deletions

View File

@ -14,7 +14,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
@@ -739,3 +739,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
@@ -741,3 +741,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
remote-endpoint = <&hdmi_in_vp0>;
};
};

View File

@ -18,8 +18,8 @@ Subject: Add sata node for Orange-Pi-5's overlay (#8707)
> X-Git-Archeology: Subject: rockchip64-6.18: update patches
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 11 ++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index 111111111111..222222222222 100644

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
@@ -1105,6 +1105,7 @@ usbdrd3: usb@ff600000 {
@@ -1104,6 +1104,7 @@ usbdrd3: usb@ff600000 {
snps,dis-del-phy-power-chg-quirk;
snps,dis_enblslpm_quirk;
snps,dis-tx-ipgap-linecheck-quirk;

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
@@ -785,6 +785,28 @@ vop_mmu: iommu@ff373f00 {
@@ -784,6 +784,28 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

View File

@ -3907,7 +3907,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
@@ -1289,6 +1289,41 @@ gpu: gpu@27800000 {
@@ -1277,6 +1277,41 @@ gpu: gpu@27800000 {
status = "disabled";
};
@ -3949,7 +3949,7 @@ index 111111111111..222222222222 100644
vop: vop@27d00000 {
compatible = "rockchip,rk3576-vop";
reg = <0x0 0x27d00000 0x0 0x3000>, <0x0 0x27d05000 0x0 0x1000>;
@@ -2694,6 +2729,7 @@ sram: sram@3ff88000 {
@@ -2680,6 +2715,7 @@ sram: sram@3ff88000 {
/* start address and size should be 4k align */
rkvdec_sram: rkvdec-sram@0 {
reg = <0x0 0x78000>;

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
@@ -604,6 +604,67 @@ tsadc: tsadc@ff250000 {
@@ -603,6 +603,67 @@ tsadc: tsadc@ff250000 {
status = "disabled";
};

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
@@ -846,6 +846,20 @@ vop_mmu: iommu@ff373f00 {
@@ -845,6 +845,20 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

View File

@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -973,6 +993,7 @@ cru: clock-controller@ff440000 {
@@ -972,6 +992,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>,
@ -96,7 +96,7 @@ index 111111111111..222222222222 100644
<&cru SCLK_RTC32K>;
assigned-clock-parents =
<&cru HDMIPHY>, <&cru PLL_APLL>,
@@ -994,6 +1015,7 @@ cru: clock-controller@ff440000 {
@@ -993,6 +1014,7 @@ cru: clock-controller@ff440000 {
<150000000>, <75000000>,
<75000000>, <150000000>,
<75000000>, <75000000>,

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 {
@@ -1218,6 +1218,8 @@ usbdrd3: usb@ff600000 {
<&cru ACLK_USB3OTG>;
clock-names = "ref_clk", "suspend_clk",
"bus_clk";

View File

@ -188,7 +188,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
@@ -1056,6 +1056,43 @@ u2phy_host: host-port {
@@ -1055,6 +1055,43 @@ u2phy_host: host-port {
};
};
@ -232,7 +232,7 @@ index 111111111111..222222222222 100644
sdmmc: mmc@ff500000 {
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff500000 0x0 0x4000>;
@@ -1222,6 +1259,8 @@ usbdrd3: usb@ff600000 {
@@ -1221,6 +1258,8 @@ usbdrd3: usb@ff600000 {
resets = <&cru SRST_USB3OTG>;
reset-names = "usb3-otg";
dr_mode = "otg";