From 223293205a7265c8b02882461ba8996650048ade Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 06:33:33 +0000
Subject: [PATCH] audio ok
---
kernel/arch/arm64/boot/dts/rockchip/rk3528.dtsi | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3528.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3528.dtsi
index adf9222..029e725 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3528.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3528.dtsi
@@ -220,9 +220,6 @@
rockchip,pvtm-temp-prop = <0 0>;
rockchip,pvtm-thermal-zone = "soc-thermal";
rockchip,grf = <&grf>;
- rockchip,temp-hysteresis = <5000>;
- rockchip,low-temp = <10000>;
- rockchip,low-temp-min-volt = <900000>;
opp-408000000 {
opp-hz = /bits/ 64 <408000000>;
@@ -452,21 +449,17 @@
compatible = "rockchip,mpp-service";
rockchip,taskqueue-count = <5>;
rockchip,resetgroup-count = <5>;
- rockchip,grf = <&grf>;
- rockchip,grf-mem-offset = <0x20010>, <0x40034>, <0x40034>,
- <0x600e0>, <0x600e0>;
- rockchip,grf-mem-on-values = <0x00000021>, <0x0f040000>, <0x0f040000>,
- <0xf0040000>, <0xf0040000>;
- rockchip,grf-mem-off-values = <0xffff0021>, <0x0f040f04>, <0x0f040f04>,
- <0xf004f004>, <0xf004f004>;
- rockchip,grf-names = "grf_rkvenc2", "grf_vdpu1", "grf_vdpu2",
- "grf_iep2", "grf_vdpp";
status = "disabled";
};
psci {
compatible = "arm,psci-1.0";
method = "smc";
+ };
+
+ rkvtunnel: rkvtunnel {
+ compatible = "rockchip,video-tunnel";
+ status = "disabled";
};
rockchip_suspend: rockchip-suspend {
@@ -494,6 +487,12 @@
rockchip,temp-hysteresis = <5000>; /* millicelsius */
rockchip,offline-cpu-temp = <105000>; /* millicelsius */
rockchip,temp-offline-cpus = "2-3";
+ };
+
+ secure_otp: secure-otp {
+ compatible = "rockchip,secure-otp";
+ rockchip,otp-size = <32>;
+ status = "disabled";
};
thermal_zones: thermal-zones {
@@ -645,12 +644,15 @@
resets = <&cru SRST_ARESETN_USB3OTG>;
reset-names = "usb3-otg";
snps,dis_enblslpm_quirk;
- snps,dis-u1u2-quirk;
+ snps,dis-u1-entry-quirk;
+ snps,dis-u2-entry-quirk;
snps,dis-u2-freeclk-exists-quirk;
snps,dis-del-phy-power-chg-quirk;
snps,dis-tx-ipgap-linecheck-quirk;
snps,xhci-trb-ent-quirk;
snps,dis_rxdet_inp3_quirk;
+ snps,parkmode-disable-hs-quirk;
+ snps,parkmode-disable-ss-quirk;
quirk-skip-phy-init;
status = "disabled";
};
@@ -810,7 +812,6 @@
qos_vdpp: qos@ff270480 {
compatible = "syscon";
reg = <0x0 0xff270480 0x0 0x20>;
- priority-init = <0x202>;
};
qos_vop: qos@ff270500 {
@@ -987,7 +988,6 @@
};
pd_vo@RK3528_PD_VO {
reg = <RK3528_PD_VO>;
- pm_qos = <&qos_vdpp>;
};
pd_vpu@RK3528_PD_VPU {
reg = <RK3528_PD_VPU>;
@@ -1073,9 +1073,6 @@
rockchip,pvtm-temp-prop = <0 0>;
rockchip,pvtm-thermal-zone = "soc-thermal";
rockchip,grf = <&grf>;
- rockchip,temp-hysteresis = <5000>;
- rockchip,low-temp = <10000>;
- rockchip,low-temp-min-volt = <900000>;
opp-300000000 {
opp-hz = /bits/ 64 <300000000>;
@@ -1195,7 +1192,6 @@
clock-names = "aclk", "iface", "clk_hevc_cabac";
#iommu-cells = <0>;
rockchip,shootdown-entire;
- rockchip,master-handle-irq;
status = "disabled";
};
@@ -1214,6 +1210,9 @@
assigned-clock-rates = <300000000>, <300000000>;
iommus = <&rkvenc_mmu>;
rockchip,srv = <&mpp_srv>;
+ rockchip,grf = <&grf>;
+ rockchip,grf-mem-offset = <0x20010>;
+ rockchip,grf-mem-values = <0x00000021>, <0xffff0021>;
rockchip,taskqueue-node = <1>;
rockchip,resetgroup-node = <1>;
status = "disabled";
@@ -1245,6 +1244,9 @@
reset-names = "shared_video_a", "shared_video_h";
iommus = <&vdpu_mmu>;
rockchip,srv = <&mpp_srv>;
+ rockchip,grf = <&grf>;
+ rockchip,grf-mem-offset = <0x40034>;
+ rockchip,grf-mem-values = <0x0f040000>, <0x0f040f04>;
rockchip,taskqueue-node = <2>;
rockchip,resetgroup-node = <2>;
rockchip,disable-auto-freq;
@@ -1400,7 +1402,6 @@
clock-names = "aclk", "iface";
#iommu-cells = <0>;
rockchip,shootdown-entire;
- rockchip,disable-mmu-reset;
status = "disabled";
};
@@ -1418,6 +1419,9 @@
<&cru SRST_RESETN_CORE_VDPP>;
reset-names = "shared_rst_a", "shared_rst_h", "shared_rst_s";
rockchip,srv = <&mpp_srv>;
+ rockchip,grf = <&grf>;
+ rockchip,grf-mem-offset = <0x600e0>;
+ rockchip,grf-mem-values = <0xf0040000>, <0xf004f004>;
rockchip,taskqueue-node = <3>;
rockchip,resetgroup-node = <3>;
rockchip,disable-auto-freq;
@@ -1522,14 +1526,13 @@
<&cru CLK_SFR_HDMI>,
<&cru CLK_CEC_HDMI>,
<&inno_hdmiphy_clk>;
- clock-names = "iahb", "isfr", "cec", "dclk_vop";
+ clock-names = "iahb", "isfr", "cec", "dclk_vp0";
ddc-i2c-scl-high-time-ns = <9625>;
ddc-i2c-scl-low-time-ns = <10000>;
reg-io-width = <4>;
rockchip,grf = <&grf>;
- pinctrl-names = "default", "idle";
+ pinctrl-names = "default";
pinctrl-0 = <&hdmi_pins>;
- pinctrl-1 = <&hdmi_pins_idle>;
phys = <&hdmiphy>;
phy-names = "hdmi";
#sound-dai-cells = <0>;
@@ -1896,8 +1899,6 @@
reg = <0x0 0xffac0000 0x0 0x100>;
clocks = <&cru TCLK_WDT_NS>, <&cru PCLK_WDT_NS>;
clock-names = "tclk", "pclk";
- resets = <&cru SRST_PRESETN_WDT_NS>;
- reset-names = "reset";
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
@@ -1917,6 +1918,8 @@
rockchip,hw-tshut-temp = <120000>;
rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */
+ nvmem-cells = <&cpu_tsadc_trim_l>, <&cpu_tsadc_trim_h>;
+ nvmem-cell-names = "trim_l", "trim_h";
status = "disabled";
};
@@ -1938,13 +1941,10 @@
interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru MCLK_SAI_I2S3>, <&cru HCLK_SAI_I2S3>;
clock-names = "mclk", "hclk";
- assigned-clocks = <&cru MCLK_SAI_I2S3>;
- assigned-clock-rates = <6144000>;
dmas = <&dmac 5>;
dma-names = "tx";
resets = <&cru SRST_MRESETN_SAI_I2S3>, <&cru SRST_HRESETN_SAI_I2S3>;
reset-names = "m", "h";
- rockchip,always-on;
#sound-dai-cells = <0>;
status = "disabled";
};
@@ -2320,6 +2320,12 @@
dmc_opp_info: dmc-opp-info@3e {
reg = <0x3e 0x6>;
};
+ cpu_tsadc_trim_l: cpu-tsadc-trim-l@44 {
+ reg = <0x44 0x1>;
+ };
+ cpu_tsadc_trim_h: cpu-tsadc-trim-h@45 {
+ reg = <0x45 0x1>;
+ };
};
dmac: dma-controller@ffd60000 {
--
Gitblit v1.6.2