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/rk3566-rk817-tablet-v10.dts | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
index 32601e4..9cdae50 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
@@ -137,25 +137,24 @@
};
rk817-sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,name = "rockchip,rk817-codec";
- simple-audio-card,mclk-fs = <256>;
-
- simple-audio-card,cpu {
- sound-dai = <&i2s1_8ch>;
- };
- simple-audio-card,codec {
- sound-dai = <&rk817_codec>;
- };
- };
-
- rk_headset: rk-headset {
- compatible = "rockchip_headset";
- headset_gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
+ compatible = "rockchip,multicodecs-card";
+ rockchip,card-name = "rockchip-rk817";
+ hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
+ io-channels = <&saradc 2>;
+ io-channel-names = "adc-detect";
+ keyup-threshold-microvolt = <1800000>;
+ poll-interval = <100>;
+ rockchip,format = "i2s";
+ rockchip,mclk-fs = <256>;
+ rockchip,cpu = <&i2s1_8ch>;
+ rockchip,codec = <&rk817_codec>;
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
- io-channels = <&saradc 2>;
+ play-pause-key {
+ label = "playpause";
+ linux,code = <KEY_PLAYPAUSE>;
+ press-threshold-microvolt = <2000>;
+ };
};
sdio_pwrseq: sdio-pwrseq {
@@ -195,6 +194,7 @@
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_irq>;
WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
+ WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -482,7 +482,7 @@
status = "okay";
vdd_cpu: tcs4525@1c {
- compatible = "tcs,tcs452x";
+ compatible = "tcs,tcs4525";
reg = <0x1c>;
vin-supply = <&vccsys>;
regulator-compatible = "fan53555-reg";
@@ -997,12 +997,12 @@
soc_slppin_gpio: soc_slppin_gpio {
rockchip,pins =
- <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
- <0 RK_PA2 1 &pcfg_pull_up>;
+ <0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
@@ -1116,7 +1116,8 @@
&sdhci {
bus-width = <8>;
- supports-emmc;
+ no-sdio;
+ no-sd;
non-removable;
max-frequency = <200000000>;
status = "okay";
@@ -1124,7 +1125,8 @@
&sdmmc0 {
max-frequency = <150000000>;
- supports-sd;
+ no-sdio;
+ no-mmc;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
@@ -1139,7 +1141,8 @@
&sdmmc1 {
max-frequency = <150000000>;
- supports-sdio;
+ no-sd;
+ no-mmc;
bus-width = <4>;
disable-wp;
cap-sd-highspeed;
--
Gitblit v1.6.2