diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts index 931ca2d37f51..42074d7bdc7d 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -168,7 +168,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -176,13 +176,13 @@ compatible = "bluetooth-platdata"; /*clocks = <&rk809 1>;*/ /*clock-names = "ext_clock";*/ - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts index 6461ac3ca820..e0e18b4d1c41 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -99,7 +99,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts index afbe299d8951..5d57841eaaef 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -99,7 +99,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi index 8ef7171c11b5..452f1d8de60c 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -157,8 +157,8 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -166,13 +166,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-mini-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/px30-mini-evb-v11.dtsi index 11418bbc0dc6..ad348b62cd35 100644 --- a/arch/arm64/boot/dts/rockchip/px30-mini-evb-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30-mini-evb-v11.dtsi @@ -25,7 +25,7 @@ }; &wireless_bluetooth { - BT,reset_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi index a6a9cd52c2b0..1a033a014ed5 100644 --- a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -192,12 +192,12 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_gpio>; - BT,power_gpio = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -207,7 +207,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "ap6212"; - WIFI,host_wake_irq = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; 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 7bf71b608f15..fd4b0404b881 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -187,12 +187,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_pin>; - BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -202,7 +202,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6255"; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi index b8e2e81c6784..145343786c47 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi @@ -18,18 +18,18 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6256"; - WIFI,host_wake_irq = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_pin>; - BT,power_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi index 66fcf6ca324c..0faf2d994866 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -244,12 +244,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_pin>; - BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -257,7 +257,7 @@ compatible = "wlan-platdata"; rockchip,grf = <&grf>; wifi_chip_type = "ap6255"; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi index f6a6febe2e64..ae6c23215ee3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -260,12 +260,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_pin>; - BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -275,7 +275,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6255"; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v13.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v13.dtsi index 1a87b73b0d3d..071cf24566d1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v13.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v13.dtsi @@ -17,7 +17,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6256"; - WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi index e04c3e01cd27..d78e6a1fc350 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi @@ -48,12 +48,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4_rts>; pinctrl-1 = <&uart4_rts_pin>; - BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi index d16b312f9b28..fb8746248df6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -230,12 +230,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_pin>; - BT,power_gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -245,7 +245,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6255"; - WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308bs-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308bs-evb-v11.dtsi index 4bd187f901c0..606164c4103d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308bs-evb-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308bs-evb-v11.dtsi @@ -25,12 +25,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_pin>; - BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -40,7 +40,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; wifi_chip_type = "ap6256"; - WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi index a71f6622ee92..d4a9d1c3ebf7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -122,20 +122,20 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "rtl8723cs"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,vbat_gpio = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>; status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts index a32af557558f..e306fd00bac8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -187,7 +187,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -195,13 +195,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts index 866508238505..8dc6d5044b58 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -197,7 +197,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6255"; - WIFI,host_wake_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -205,13 +205,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts index 3ced8b8d7745..177ddece3d29 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -187,7 +187,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6255"; - WIFI,host_wake_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -195,13 +195,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts index 22c2745e2738..9792f1f8ef39 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -187,7 +187,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6256"; - WIFI,host_wake_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -195,13 +195,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts index 2791c7aa42ee..18ead76c35e4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -92,7 +92,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts index 9c4dcf7bea73..c3497596812a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -92,7 +92,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi index 1eba0d018486..e4fd838cc329 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -140,8 +140,8 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -149,13 +149,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk817 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi index 60640595bce8..6a6b1520a5ec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -169,12 +169,12 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - BT,power_gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 26 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -183,7 +183,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "rtl8822bs"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio1 19 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi index 3e98f013bb61..3f51e1acd27c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -132,12 +132,12 @@ compatible = "bluetooth-platdata"; clocks = <&rk805 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - BT,power_gpio = <&gpio1 21 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 26 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -146,7 +146,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio1 19 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts index 4f525e72ae26..359ecabbbb72 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -119,12 +119,12 @@ compatible = "bluetooth-platdata"; clocks = <&rk805 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - BT,power_gpio = <&gpio1 21 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 26 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -133,7 +133,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio1 19 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3358-evb-ddr3.dtsi b/arch/arm64/boot/dts/rockchip/rk3358-evb-ddr3.dtsi index 62fd8a2acc03..5c30e4e79cfd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3358-evb-ddr3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3358-evb-ddr3.dtsi @@ -166,7 +166,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -174,13 +174,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3358m-vehicle-ddr3.dtsi b/arch/arm64/boot/dts/rockchip/rk3358m-vehicle-ddr3.dtsi index 200b573f4ec5..1f3ddedc01bb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3358m-vehicle-ddr3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3358m-vehicle-ddr3.dtsi @@ -217,7 +217,7 @@ wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6212"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -225,13 +225,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi index 4d8b8e88514b..215895c46d3c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -245,7 +245,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6255"; sdio_vref = <1800>; //1800mv or 3300mv - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -253,15 +253,15 @@ compatible = "bluetooth-platdata"; clocks = <&rk808 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - /* BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; */ - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + /* BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; */ + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi index 68d7e51f0a04..3990bc653abd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -133,7 +133,7 @@ */ wifi_chip_type = "ap6210"; sdio_vref = <1800>; //1800mv or 3300mv - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -141,15 +141,15 @@ compatible = "bluetooth-platdata"; clocks = <&rk818 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - //BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + //BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts index a91fd2588402..c92b40753002 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -197,8 +197,8 @@ wifi_chip_type = "rtl8723ds"; sdio_vref = <1800>; /*1800mv or 3300mv*/ - WIFI,host_wake_irq = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - WIFI,vbat_gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -206,10 +206,10 @@ compatible = "bluetooth-platdata"; keep_bt_power_on; - BT,power_gpio = <&gpio3 4 GPIO_ACTIVE_HIGH>; /* GPIO3_A4 */ - BT,reset_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; /* GPIO3_A2 */ - BT,wake_gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>; /* GPIO3_A7 */ - BT,wake_host_irq = <&gpio3 3 GPIO_ACTIVE_HIGH>; /* GPIO3_A3 */ + BT,power-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>; /* GPIO3_A4 */ + BT,reset-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; /* GPIO3_A2 */ + BT,wake-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; /* GPIO3_A7 */ + BT,wake_host-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; /* GPIO3_A3 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts index b1700e5922f4..95652c23a911 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -132,7 +132,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "rtl8189es"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -141,14 +141,14 @@ //clocks = <&rk808 1>; //clock-names = "ext_clock"; /* wifi-bt-power-toggle; */ - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - /* BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + /* BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts index 2d7123ad28f8..b490991b9cde 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -165,7 +165,7 @@ * esp8089 */ wifi_chip_type = "ap6255"; - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -173,15 +173,15 @@ compatible = "bluetooth-platdata"; clocks = <&rk818 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - //BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + //BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi index cd565734c716..3e19ebcbe0dc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -140,7 +140,7 @@ */ wifi_chip_type = "ap6255"; sdio_vref = <1800>; //1800mv or 3300mv - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -148,15 +148,15 @@ compatible = "bluetooth-platdata"; clocks = <&rk818 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - //BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + //BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts index ef3ffd8d9fc4..1908fe307916 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -145,22 +145,22 @@ * esp8089 */ wifi_chip_type = "ap6255"; - WIFI,vbat_gpio = <&gpio0 2 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - //BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; - BT,reset_gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + //BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts index a27a50bc190a..fa0b46e70630 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -146,22 +146,22 @@ * esp8089 */ wifi_chip_type = "rtl8723bs"; - WIFI,vbat_gpio = <&gpio0 2 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_rts_gpio>; - //BT,power_gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>; - BT,reset_gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 7 GPIO_ACTIVE_HIGH>; + //BT,power-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi index e8c75eb6c500..b71e65072473 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -125,7 +125,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -134,14 +134,14 @@ clocks = <&rk808 1>; clock-names = "ext_clock"; /* wifi-bt-power-toggle; */ - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - /* BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; + /* BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi index 65da8f8d4465..545e2b1f5fc6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -174,8 +174,8 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ - WIFI,poweren_gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,poweren-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -184,14 +184,14 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ - BT,wake_host_irq = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* GPIO2_D3 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + BT,wake_host-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* GPIO2_D3 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi index 51b5022717ef..a0abd157d8dc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -205,8 +205,8 @@ r}; rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ - WIFI,poweren_gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,poweren-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -215,14 +215,14 @@ r}; clocks = <&rk808 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi index 59cdade78801..8d2d96a5a27d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -80,8 +80,8 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ - WIFI,poweren_gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,poweren-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -90,14 +90,14 @@ clocks = <&rk808 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts index 8d7da4b3ba00..1f750e72560a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -346,21 +346,21 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts index bc315bc708f7..ae2ce33c3450 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -284,21 +284,21 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ status = "okay"; }; wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts index abe6a9d6863b..a2c4a1798e33 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -239,7 +239,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ status = "okay"; }; @@ -248,14 +248,14 @@ clocks = <&rk818 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts index ea9c3e589d94..ef530ddbc3db 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -158,7 +158,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -167,14 +167,14 @@ clocks = <&rk808 1>; clock-names = "ext_clock"; /* wifi-bt-power-toggle; */ - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - /* BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 27 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; + /* BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi index 0e441ca548d1..1e2fc874fe02 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -184,7 +184,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6255"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -192,13 +192,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk808 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts index 4927686c7f64..8405255ae268 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -246,7 +246,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ status = "okay"; }; @@ -255,14 +255,14 @@ clocks = <&rk808 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - //BT,power_gpio = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + //BT,power-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; /* GPIOx_xx */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts index 142515e57127..bd61a6f2fe9d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -117,13 +117,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk808 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ + uart_rts-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */ pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ - BT,wake_gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ - BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ + BT,reset-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; /* GPIO0_B1 */ + BT,wake-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; /* GPIO2_D2 */ + BT,wake_host-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */ status = "okay"; }; @@ -132,7 +132,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6354"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ + WIFI,host_wake-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */ status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts index 23cf1a3b8b98..430d521d5253 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -230,7 +230,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -238,13 +238,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts index 8c4d683d526e..b8babc18a45c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -225,7 +225,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -233,13 +233,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts index b2b574557f5b..e4d1474dc2f6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -225,7 +225,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -233,13 +233,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts index f5d7cd4f30d4..0a1e1ef31823 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -240,7 +240,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -248,13 +248,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts index 7753f6c85913..d730b3392ce9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -227,7 +227,7 @@ rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -235,13 +235,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart0_rts>, <&bt_irq_gpio>; pinctrl-1 = <&uart0_gpios>; - BT,reset_gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3518-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3518-evb1-ddr4-v10.dtsi index f6c8ce23f043..638d7af332e9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3518-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3518-evb1-ddr4-v10.dtsi @@ -25,13 +25,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m1_rtsn>; pinctrl-1 = <&uart2m1_gpios>; - BT,reset_gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -41,7 +41,7 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-demo1-lp4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-demo1-lp4-v10.dtsi index c1f34d084068..d2a80342ebdb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-demo1-lp4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-demo1-lp4-v10.dtsi @@ -23,12 +23,12 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn>; pinctrl-1 = <&uart2m0_gpios>; - BT,reset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -38,7 +38,7 @@ wifi_chip_type = "rtl8822cs"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-demo4-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-demo4-ddr4-v10.dtsi index c2af2c2aa52b..4984804c6402 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-demo4-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-demo4-ddr4-v10.dtsi @@ -23,12 +23,12 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn>; pinctrl-1 = <&uart2m0_gpios>; - BT,reset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -38,7 +38,7 @@ wifi_chip_type = "rtl8822cs"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-demo6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-demo6-ddr3-v10.dtsi index bf9b4ca8d9a5..56c350787a98 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-demo6-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-demo6-ddr3-v10.dtsi @@ -53,13 +53,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m1_rtsn &bt_enable_h>; pinctrl-1 = <&uart2m1_gpios>; - BT,reset_gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -69,8 +69,8 @@ wifi_chip_type = "aic8800"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq >; - WIFI,host_wake_irq = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; - //WIFI,reset_gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; + //WIFI,reset-gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dtsi index c3c340968ddd..d9648c998148 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dtsi @@ -25,13 +25,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m1_rtsn>; pinctrl-1 = <&uart2m1_gpios>; - BT,reset_gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -41,7 +41,7 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dtsi index 2cd94a632058..a44649df5c8a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dtsi @@ -54,13 +54,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m1_rtsn>; pinctrl-1 = <&uart2m1_gpios>; - BT,reset_gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -70,7 +70,7 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dtsi index a427da4e2376..27aacb3274e6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dtsi @@ -55,13 +55,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn>; pinctrl-1 = <&uart2m0_gpios>; - BT,reset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -71,8 +71,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_enable &wifi_host_wake_irq &clkm0_32k_out>; - WIFI,reset_gpio = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,reset-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-dictpen-test3-v20.dts b/arch/arm64/boot/dts/rockchip/rk3562-dictpen-test3-v20.dts index e18343ba125c..6bac83ca1421 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-dictpen-test3-v20.dts +++ b/arch/arm64/boot/dts/rockchip/rk3562-dictpen-test3-v20.dts @@ -143,7 +143,7 @@ wifi_chip_type = "ap6203"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -151,13 +151,13 @@ compatible = "bluetooth-platdata"; clocks = <&rk817 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,power_gpio = <&gpio1 RK_PD7 GPIO_ACTIVE_LOW>; - //BT,wake_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; - //BT,wake_host_irq = <&gpio1 RK_PD6 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio1 RK_PD7 GPIO_ACTIVE_LOW>; + //BT,wake-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + //BT,wake_host-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10.dtsi index 7fdb0557edda..7dffa686b75d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10.dtsi @@ -158,8 +158,8 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -168,13 +168,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10.dtsi index 5478c8a29315..a5a0171173a4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10.dtsi @@ -160,8 +160,8 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -170,13 +170,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-project-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3562-project-demo.dtsi index 5d22f14c3950..5f7075fc6ef5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-project-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3562-project-demo.dtsi @@ -207,8 +207,8 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -217,13 +217,13 @@ //clocks = <&rk817 1>; //clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3562-rk817-tablet-v10.dts index 4a36d19ff622..b0214d401263 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-rk817-tablet-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3562-rk817-tablet-v10.dts @@ -183,9 +183,9 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; - WIFI,vbat_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -194,13 +194,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-test1-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3562-test1-ddr3-v10.dtsi index 5bd49a130bc3..41df5362afd6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-test1-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3562-test1-ddr3-v10.dtsi @@ -148,8 +148,8 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -158,13 +158,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3562-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3562-toybrick.dtsi index 14c5526e0fcb..e179e6fe346d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3562-toybrick.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3562-toybrick.dtsi @@ -199,8 +199,8 @@ wifi_chip_type = "ap6275s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -209,13 +209,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi index b81f91d1b4e8..4391822ca783 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -103,7 +103,7 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -112,13 +112,13 @@ clocks = <&pmucru CLK_RTC_32K>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi index 243eb085e9a4..7c95e6260b16 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -449,13 +449,13 @@ }; &wireless_bluetooth { - uart_rts_gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m1_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; status = "disabled"; }; @@ -463,7 +463,7 @@ status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; }; &pinctrl { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi index bf0e166e339f..421b2841808b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -434,20 +434,20 @@ }; &wireless_bluetooth { - uart_rts_gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m1_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; &wireless_wlan { pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; }; &work_led { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi index 79e607fa8217..f537e877216c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -606,8 +606,8 @@ &wireless_wlan { 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; }; &work_led { @@ -619,12 +619,12 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi index 0a7e2881d1fe..88bee21415c8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -505,21 +505,21 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; &wireless_wlan { 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; }; &work_led { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi index 82e4775c1a2f..4dd0d83f1ee7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -277,13 +277,13 @@ }; &wireless_bluetooth { - uart_rts_gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m1_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts index f934c3126b86..e9fe59d0286d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -197,8 +197,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_vbat &wifi_host_wake_irq>; - WIFI,vbat_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -207,16 +207,16 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts index 97c4d225103a..b2070ea3d194 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -147,8 +147,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_vbat &wifi_host_wake_irq>; - WIFI,vbat_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -157,13 +157,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts index 4f3e218b59df..2e61980b34f1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -123,7 +123,7 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; status = "disabled"; }; @@ -132,13 +132,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts index dfcf9a2b4f54..be8c7e49388f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -211,9 +211,9 @@ wifi_chip_type = "rtl8723cs"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,vbat_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_LOW>; - WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_LOW>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -222,13 +222,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts index 4578517486dd..01d3e86636ac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -168,9 +168,9 @@ wifi_chip_type = "rtl8821cs"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,vbat_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,vbat-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -179,13 +179,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts index 8336b51f5aae..d6541f27fb78 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -193,8 +193,8 @@ wifi_chip_type = "ap6255"; 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -203,13 +203,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts index b71f170cafcd..426fe4031eac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -193,8 +193,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -203,13 +203,13 @@ clocks = <&rk817 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10.dtsi index eb8d1f297ca8..5d81dc87afd3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10.dtsi @@ -624,8 +624,8 @@ &wireless_wlan { 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; }; &work_led { @@ -637,12 +637,12 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi index b7b36b5b9bab..8c66b7cdd253 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -342,7 +342,7 @@ compatible = "wlan-platdata"; rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; - WIFI,poweren_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -351,13 +351,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m0_rtsn>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi index 2b72b8c7bbe5..71ef9923fd5b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -488,7 +488,7 @@ &wireless_wlan { pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -496,12 +496,12 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m0_rtsn>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi index 81b2de38a5a3..7c9f5b40fe70 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -577,8 +577,8 @@ &wireless_wlan { 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -586,13 +586,13 @@ clocks = <&pmucru CLK_RTC_32K>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi index ceaf0f2b841d..b548dfa667e2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -547,7 +547,7 @@ &wireless_wlan { pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -555,12 +555,12 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m0_rtsn>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi index 894fdc0ab3c8..ae557d913422 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -434,8 +434,8 @@ &wireless_wlan { 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>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -443,13 +443,13 @@ clocks = <&pmucru CLK_RTC_32K>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi index 0c8275502435..2e61ef9af85b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi @@ -469,7 +469,7 @@ &wireless_wlan { pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -477,13 +477,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_pin>; - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi index cb43e52f429a..97aae428a91a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -590,7 +590,7 @@ &wireless_wlan { pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; }; &wireless_bluetooth { @@ -598,13 +598,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m0_rtsn>; pinctrl-1 = <&uart8_pin>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi index a8db076c5ca0..28be87d69514 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -370,13 +370,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m0_rtsn>; pinctrl-1 = <&uart8_pin>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-ebook-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-ebook-v10.dts index 8202c3218308..0fe640345549 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-ebook-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-ebook-v10.dts @@ -196,13 +196,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -211,8 +211,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-ebook-x3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-ebook-x3-v10.dts index 4ac22b204e6d..7c473382c81b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-ebook-x3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-ebook-x3-v10.dts @@ -210,13 +210,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -225,8 +225,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-evb.dtsi index 60fec7dc8f08..6ebe308941aa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-evb.dtsi @@ -207,13 +207,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -222,8 +222,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi index 0f857c602ef5..f07a39c6b212 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-tablet.dtsi @@ -254,13 +254,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -269,8 +269,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi index a7b9363d3f2a..acfc8de07199 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi @@ -906,5 +906,5 @@ }; &wireless_wlan { - WIFI,poweren_gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle.dtsi index 243b4cafe2d8..5498c092419f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle.dtsi @@ -173,13 +173,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -188,8 +188,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3576s-evb.dtsi index d743c12c4b82..8a534f342a53 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576s-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576s-evb.dtsi @@ -207,13 +207,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -222,8 +222,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3576s-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576s-tablet-v10.dts index 27b75c67801a..7527d4fbbf34 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576s-tablet-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576s-tablet-v10.dts @@ -261,13 +261,13 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart4m1_rtsn>; pinctrl-1 = <&uart4_gpios>; - BT,reset_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -276,8 +276,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index ea7c8ea9d2ea..c4ef45f333c6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -216,13 +216,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -231,8 +231,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb10.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb10.dtsi index 7040968053c0..29e7072860e9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb10.dtsi @@ -268,13 +268,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -283,8 +283,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index ec9136eebd35..85d82cf5266b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -173,13 +173,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m0_rtsn>, <&bt_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -188,8 +188,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index 3603c268182d..4e76a04eb431 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -177,13 +177,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -192,8 +192,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi index 140343f69dea..4f913d42dfa7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi @@ -240,13 +240,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -255,8 +255,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb7-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb7-v11.dtsi index fac0f509bfdd..da4427af62b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb7-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb7-v11.dtsi @@ -252,13 +252,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -267,8 +267,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi index 1698bd06f59a..fca9db1b5adf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi @@ -149,13 +149,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -164,8 +164,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi index a5c52dfba52b..f715553e8048 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi @@ -205,13 +205,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -220,8 +220,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v20.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v20.dtsi index 77ac53749d9b..84ab40263ee9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v20.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v20.dtsi @@ -98,13 +98,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -113,8 +113,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v21.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v21.dtsi index 37e8cf8cf514..3151f16b9d7c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v21.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v21.dtsi @@ -110,13 +110,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -125,8 +125,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts index e417edfe9a5b..12ba42fc05e1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts @@ -320,12 +320,12 @@ }; wireless_bluetooth: wireless-bluetooth { - BT,reset_gpio = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; status = "okay"; }; wireless_wlan: wireless-wlan { - WIFI,poweren_gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v23.dts b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v23.dts index c3104909fd60..447dba9d2a28 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v23.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v23.dts @@ -496,13 +496,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart7m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart7_gpios>; - BT,reset_gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -511,8 +511,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi index 59e6f5d3b556..f933c5d11ede 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi @@ -180,13 +180,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -195,8 +195,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-s66-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-s66-v10.dtsi index 77be7ffaf869..4b56a3a03b09 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-s66-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-s66-v10.dtsi @@ -77,14 +77,14 @@ wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; - BT,reset_gpio = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; status = "okay"; }; wireless_wlan: wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "ap6398s"; - WIFI,poweren_gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index b642a65edc94..4cd5415922e3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -218,13 +218,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_gpio>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -233,8 +233,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index a5ca242779af..0465778bbb0d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -200,13 +200,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_wake_host_irq>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -215,8 +215,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi index ba5c93768449..315bf02279d6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi @@ -201,13 +201,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_gpio>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -216,8 +216,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi index a4de74df789a..4a59c2717aff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi @@ -182,13 +182,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart8m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_wake_host_irq>; pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -197,8 +197,8 @@ wifi_chip_type = "ap6255"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi index 822bb7b885af..4d754d69e42c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi @@ -298,13 +298,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart7m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart7_gpios>; - BT,reset_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -313,8 +313,8 @@ wifi_chip_type = "ap6398s"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index 622b2dc6ef8b..f7e58d7db1e5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -295,13 +295,13 @@ compatible = "bluetooth-platdata"; clocks = <&hym8563>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart7m1_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>; pinctrl-1 = <&uart7_gpios>; - BT,reset_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + BT,reset-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + BT,wake-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; + BT,wake_host-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -310,8 +310,8 @@ wifi_chip_type = "ap6275p"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + WIFI,poweren-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dtsi b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dtsi index ee65864a5060..8c3cb43766d3 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dtsi @@ -104,11 +104,11 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn_pins>; pinctrl-1 = <&uart2_gpios>; - BT,power_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -118,7 +118,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "rk96x"; - WIFI,host_wake_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10.dts index 77b9f3cd1b9d..f79d92f045f7 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10.dts @@ -221,11 +221,11 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn_pins>; pinctrl-1 = <&uart2_gpios>; - BT,power_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -235,7 +235,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "rk96x"; - WIFI,host_wake_irq = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb3-v10.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb3-v10.dts index 4e0d11055849..d0dacbfed835 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb3-v10.dts @@ -200,11 +200,11 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn_pins>; pinctrl-1 = <&uart2_gpios>; - BT,power_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -214,7 +214,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "rk96x"; - WIFI,host_wake_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb4-v10.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb4-v10.dts index 2a2830ee2914..71d28c743afc 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb4-v10.dts @@ -111,11 +111,11 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn_pins>; pinctrl-1 = <&uart2_gpios>; - BT,power_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -125,7 +125,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "rk96x"; - WIFI,host_wake_irq = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rv1126bp-evb-v14.dtsi b/arch/arm64/boot/dts/rockchip/rv1126bp-evb-v14.dtsi index 6a5cff8a769f..2b85c32c5247 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126bp-evb-v14.dtsi +++ b/arch/arm64/boot/dts/rockchip/rv1126bp-evb-v14.dtsi @@ -70,11 +70,11 @@ wireless-bluetooth { compatible = "bluetooth-platdata"; - uart_rts_gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; + uart_rts-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart2m0_rtsn_pins>; pinctrl-1 = <&uart2_gpios>; - BT,power_gpio = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + BT,power-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -84,7 +84,7 @@ pinctrl-names = "default"; pinctrl-0 = <&wifi_wake_host>; wifi_chip_type = "rk96x"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,host_wake-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; status = "okay"; }; };