From a8a3aef9b96077a2182a6e27925ac66acd9ff4bb Mon Sep 17 00:00:00 2001 From: Han Gao Date: Sat, 20 Jul 2024 15:54:02 +0800 Subject: [PATCH] Revert "temp fix: disable poweron pin for aic8800 to make it work" This reverts commit 6f712a1d7f4069a89123f1d2f43e7daa502b4471. --- arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts | 6 ++---- arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts b/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts index d2112006e..54a94de4a 100644 --- a/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts +++ b/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts @@ -145,14 +145,12 @@ }; &wcn_wifi { - // WIFI,poweren_gpio = <&pcal6408ahk_c 4 0>; - /delete-property/ WIFI,poweren_gpio; + WIFI,poweren_gpio = <&pcal6408ahk_c 4 0>; }; &wcn_bt { - // BT,power_gpio = <&pcal6408ahk_c 5 0>; - /delete-property/ BT,power_gpio; + BT,power_gpio = <&pcal6408ahk_c 5 0>; }; &usb_1 { diff --git a/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi b/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi index eb27dd6fe..58acfb248 100644 --- a/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi +++ b/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi @@ -273,7 +273,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi_wake>; wifi_chip_type = "rtl8723ds"; - // WIFI,poweren_gpio = <&pcal6408ahk_c 4 0>; + WIFI,poweren_gpio = <&pcal6408ahk_c 4 0>; status = "okay"; }; @@ -281,7 +281,7 @@ compatible = "bluetooth-platdata"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_bt_wake>; - // BT,power_gpio = <&pcal6408ahk_c 5 0>; + BT,power_gpio = <&pcal6408ahk_c 5 0>; status = "okay"; };