diff --git a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts index 284afbb6f8dd..43615f5aa5b9 100644 --- a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts @@ -161,7 +161,7 @@ clock-names = "clk_wifi"; ref-clock-frequency = <24000000>; pinctrl-names = "default"; - pinctrl-0 = <&wifi_wake_host>; + pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "rtl8723ds"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts index 0dbb369e0b80..315c4495b2be 100644 --- a/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-dot-v10-aarch32.dts @@ -166,7 +166,7 @@ clock-names = "clk_wifi"; ref-clock-frequency = <24000000>; pinctrl-names = "default"; - pinctrl-0 = <&wifi_wake_host>; + pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "rtl8723ds"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts index b08b688a97cc..5b59d1e8e6d4 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts @@ -15,7 +15,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 = "rtl8189fs"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3308-voice-module-board-v11-aarch32.dts b/arch/arm/boot/dts/rk3308-voice-module-board-v11-aarch32.dts index 627f14a53c80..cbbf23929cbb 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-board-v11-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-voice-module-board-v11-aarch32.dts @@ -15,7 +15,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 = "rtl8189fs"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi b/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi index 36b1defbb57c..635d38fc1874 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi +++ b/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi @@ -30,7 +30,7 @@ clock-names = "clk_wifi"; ref-clock-frequency = <24000000>; pinctrl-names = "default"; - pinctrl-0 = <&wifi_wake_host>; + pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "rtl8723ds"; WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; @@ -390,11 +390,6 @@ status = "okay"; }; -&pinctrl { - pinctrl-names = "default"; - pinctrl-0 = <&rtc_32k>; -}; - &pwm3 { status = "okay"; /* Used for IR */ diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts index 837a624b75ed..5dbb7ad77f54 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -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"; @@ -600,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>; @@ -620,6 +619,12 @@ rockchip,pins = <0 RK_PA2 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>; + }; + }; }; &pwm0 { diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi index 9d032b197019..d81ece517cb9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -719,9 +719,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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi index 715b55ab2ea2..0e0cbb2932d5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -273,7 +273,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 = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; @@ -778,9 +778,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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi index b8dfdaf1d2aa..a93eb0d95cf2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -243,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"; @@ -683,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>;