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/rk3308-ai-va-v10.dts | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/kernel/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts index bf6b1ba..4ab9afd 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -190,7 +190,7 @@ uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; - pinctrl-1 = <&uart4_rts_gpio>; + pinctrl-1 = <&uart4_rts_pin>; BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -199,6 +199,8 @@ wireless-wlan { compatible = "wlan-platdata"; rockchip,grf = <&grf>; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6255"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -218,7 +220,8 @@ bus-width = <8>; cap-mmc-highspeed; mmc-hs200-1_8v; - supports-emmc; + no-sdio; + no-sd; disable-wp; non-removable; num-slots = <1>; @@ -599,9 +602,6 @@ }; &pinctrl { - pinctrl-names = "default"; - pinctrl-0 = <&rtc_32k>; - buttons { mic_mute: mic-mute { rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up>; @@ -617,6 +617,18 @@ sdio-pwrseq { wifi_enable_h: wifi-enable-h { rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + wireless-bluetooth { + uart4_gpios: uart4-gpios { + rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + wireless-wlan { + wifi_wake_host: wifi-wake-host { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>; }; }; }; @@ -645,7 +657,8 @@ &sdio { 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