From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 6b46d1b..1c24f35 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -337,6 +337,7 @@
clock-output-names = "i2s0_mclkout_to_io";
rockchip,bit-shift = <0>;
rockchip,bit-set-to-disable;
+ rockchip,clk-ignore-unused; /* for OLD SDK */
};
mclkout_i2s1: mclkout-i2s1@fd58c318 {
@@ -347,6 +348,7 @@
clock-output-names = "i2s1_mclkout_to_io";
rockchip,bit-shift = <1>;
rockchip,bit-set-to-disable;
+ rockchip,clk-ignore-unused; /* for OLD SDK */
};
mclkout_i2s1m1: mclkout-i2s1@fd58a000 {
@@ -356,6 +358,7 @@
#clock-cells = <0>;
clock-output-names = "i2s1m1_mclkout_to_io";
rockchip,bit-shift = <6>;
+ rockchip,clk-ignore-unused; /* for OLD SDK */
};
mclkout_i2s2: mclkout-i2s2@fd58c318 {
@@ -366,6 +369,7 @@
clock-output-names = "i2s2_mclkout_to_io";
rockchip,bit-shift = <2>;
rockchip,bit-set-to-disable;
+ rockchip,clk-ignore-unused; /* for OLD SDK */
};
mclkout_i2s3: mclkout-i2s3@fd58c318 {
@@ -376,6 +380,7 @@
clock-output-names = "i2s3_mclkout_to_io";
rockchip,bit-shift = <7>;
rockchip,bit-set-to-disable;
+ rockchip,clk-ignore-unused; /* for OLD SDK */
};
};
@@ -1744,6 +1749,7 @@
SYS_STATUS_PERFORMANCE DMC_FREQ_LEVEL_HIGH
SYS_STATUS_DUALVIEW DMC_FREQ_LEVEL_HIGH
SYS_STATUS_HDMIRX DMC_FREQ_LEVEL_HIGH
+ SYS_STATUS_DEEP_SUSPEND DMC_FREQ_LEVEL_HIGH
>;
auto-freq-en = <1>;
status = "disabled";
@@ -2163,6 +2169,11 @@
status = "disabled";
};
+ rkvtunnel: rkvtunnel {
+ compatible = "rockchip,video-tunnel";
+ status = "disabled";
+ };
+
rockchip_suspend: rockchip-suspend {
compatible = "rockchip,pm-rk3588";
status = "disabled";
@@ -2354,8 +2365,7 @@
rockchip,pvtm-temp-prop = <(-135) (-135)>;
rockchip,pvtm-thermal-zone = "gpu-thermal";
- clocks = <&cru CLK_GPU>;
- clock-names = "clk";
+ rockchip,opp-clocks = <&cru CLK_GPU>;
rockchip,grf = <&gpu_grf>;
volt-mem-read-margin = <
855000 1
@@ -2597,7 +2607,7 @@
};
usb_host0_ohci: usb@fc840000 {
- compatible = "generic-ohci";
+ compatible = "rockchip,rk3588-ohci", "generic-ohci";
reg = <0x0 0xfc840000 0x0 0x40000>;
interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>, <&u2phy2>, <&aclk_usb>;
@@ -2622,7 +2632,7 @@
};
usb_host1_ohci: usb@fc8c0000 {
- compatible = "generic-ohci";
+ compatible = "rockchip,rk3588-ohci", "generic-ohci";
reg = <0x0 0xfc8c0000 0x0 0x40000>;
interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>, <&u2phy3>, <&aclk_usb>;
@@ -2706,6 +2716,8 @@
mode-panic = <BOOT_PANIC>;
mode-watchdog = <BOOT_WATCHDOG>;
mode-quiescent = <BOOT_QUIESCENT>;
+ /* add a mode to capture the ramdump through usb */
+ mode-winusb = <BOOT_WINUSB>;
};
};
@@ -2965,6 +2977,8 @@
interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0m0_xfer>;
+ resets = <&cru SRST_I2C0>, <&cru SRST_P_I2C0>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -3443,8 +3457,7 @@
rockchip,pvtm-temp-prop = <(-113) (-113)>;
rockchip,pvtm-thermal-zone = "npu-thermal";
- clocks = <&cru PCLK_NPU_GRF>;
- clock-names = "pclk";
+ rockchip,opp-clocks = <&cru PCLK_NPU_GRF>, <&cru HCLK_NPU_ROOT>;
rockchip,grf = <&npu_grf>;
volt-mem-read-margin = <
855000 1
@@ -5950,6 +5963,8 @@
interrupts = <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1m0_xfer>;
+ resets = <&cru SRST_I2C1>, <&cru SRST_P_I2C1>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -5963,6 +5978,8 @@
interrupts = <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2m0_xfer>;
+ resets = <&cru SRST_I2C2>, <&cru SRST_P_I2C2>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -5976,6 +5993,8 @@
interrupts = <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c3m0_xfer>;
+ resets = <&cru SRST_I2C3>, <&cru SRST_P_I2C3>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -5989,6 +6008,8 @@
interrupts = <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c4m0_xfer>;
+ resets = <&cru SRST_I2C4>, <&cru SRST_P_I2C4>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -6002,6 +6023,8 @@
interrupts = <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c5m0_xfer>;
+ resets = <&cru SRST_I2C5>, <&cru SRST_P_I2C5>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -6429,6 +6452,8 @@
interrupts = <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c6m0_xfer>;
+ resets = <&cru SRST_I2C6>, <&cru SRST_P_I2C6>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -6442,6 +6467,8 @@
interrupts = <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c7m0_xfer>;
+ resets = <&cru SRST_I2C7>, <&cru SRST_P_I2C7>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -6455,6 +6482,8 @@
interrupts = <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&i2c8m0_xfer>;
+ resets = <&cru SRST_I2C8>, <&cru SRST_P_I2C8>;
+ reset-names = "i2c", "apb";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
--
Gitblit v1.6.2