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/rk3308b-evb-v10.dtsi | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
index f98925f..1d00090 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
@@ -109,9 +109,10 @@
};
spdif_rx_sound: spdif-rx-sound {
- status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,spdif-rx-sound";
+ status = "disabled";
+
simple-audio-card,cpu {
sound-dai = <&spdif_rx>;
};
@@ -121,9 +122,10 @@
};
spdif_tx_sound: spdif-tx-sound {
- status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,spdif-tx-sound";
+ status = "disabled";
+ simple-audio-card,mclk-fs = <128>;
simple-audio-card,cpu {
sound-dai = <&spdif_tx>;
};
@@ -163,6 +165,15 @@
regulator-max-microvolt = <1000000>;
};
+ vcc_3v3_codec: vcc_io: vcc-io {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc_io";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
vccio_sdio: vcc_1v8: vcc-1v8 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v8";
@@ -190,15 +201,6 @@
regulator-boot-on;
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
- };
-
- vcc_3v3_codec: vcc_io: vcc-io {
- compatible = "regulator-fixed";
- regulator-name = "vcc_io";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
};
vccio_flash: vccio-flash {
@@ -231,7 +233,7 @@
uart_rts_gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart0_rts>;
- pinctrl-1 = <&uart0_rts_gpio>;
+ pinctrl-1 = <&uart0_rts_pin>;
BT,power_gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
status = "okay";
@@ -241,7 +243,7 @@
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
pinctrl-names = "default";
- pinctrl-0 = <&wifi_wake_host>;
+ pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>;
wifi_chip_type = "ap6255";
WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
status = "okay";
@@ -269,6 +271,15 @@
};
};
+&rk3308bs_cpu0_opp_table {
+ opp-1008000000 {
+ status = "okay";
+ };
+ opp-1104000000 {
+ status = "okay";
+ };
+};
+
&dmc {
center-supply = <&vdd_log>;
status = "okay";
@@ -278,7 +289,8 @@
bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
- supports-emmc;
+ no-sdio;
+ no-sd;
disable-wp;
non-removable;
num-slots = <1>;
@@ -305,9 +317,9 @@
clock-frequency = <400000>;
status = "okay";
- is31fl3236: led-controller@3c {
+ is31fl3236: led-controller@3f {
compatible = "issi,is31fl3236";
- reg = <0x3c>;
+ reg = <0x3f>;
#address-cells = <1>;
#size-cells = <0>;
reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
@@ -671,9 +683,6 @@
};
&pinctrl {
- pinctrl-names = "default";
- pinctrl-0 = <&rtc_32k>;
-
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -689,6 +698,12 @@
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ wireless-bluetooth {
+ uart0_gpios: uart0-gpios {
+ rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -719,6 +734,14 @@
status = "okay";
};
+&spdif_rx {
+ #sound-dai-cells = <0>;
+};
+
+&spdif_tx {
+ #sound-dai-cells = <0>;
+};
+
&saradc {
status = "okay";
vref-supply = <&vcc_1v8>;
@@ -727,7 +750,8 @@
&sdmmc {
bus-width = <4>;
cap-sd-highspeed;
- supports-sdio;
+ no-sd;
+ no-mmc;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
--
Gitblit v1.6.2