diff --git a/arch/arm/boot/dts/amlogic/a1-a113l-ad403-spk.dts b/arch/arm/boot/dts/amlogic/a1-a113l-ad403-spk.dts index 9b615dd3b..eb3ee935e 100644 --- a/arch/arm/boot/dts/amlogic/a1-a113l-ad403-spk.dts +++ b/arch/arm/boot/dts/amlogic/a1-a113l-ad403-spk.dts @@ -804,12 +804,13 @@ status = "okay"; hostwake-gpios = <&gpio GPIOP_1 GPIO_ACTIVE_HIGH>; bt_en-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; - + reset-gpios = <&gpio GPIOX_16 GPIO_ACTIVE_HIGH>; }; &aml_wifi { - status = "disabled"; + status = "okay"; interrupt-gpios = <&gpio GPIOP_0 GPIO_ACTIVE_HIGH>; + power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; }; &pwm_cd { diff --git a/arch/arm/boot/dts/amlogic/meson-a1.dtsi b/arch/arm/boot/dts/amlogic/meson-a1.dtsi index 9bc6a7856..ef89a05c1 100644 --- a/arch/arm/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm/boot/dts/amlogic/meson-a1.dtsi @@ -946,22 +946,16 @@ aml_bt: aml_bt { compatible = "amlogic, aml-bt"; status = "disabled"; - reset-gpios = <&gpio GPIOX_16 GPIO_ACTIVE_HIGH>; }; aml_wifi: aml_wifi { compatible = "amlogic, aml-wifi"; status = "disabled"; irq_trigger_type = "IRQF_TRIGGER_LOW"; - power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; wifi_static_buf = <1>; //static buf level pinctrl-names = "default"; pinctrl-0 = <&pwm_d_pins1>; - pwm_config = <&wifi_pwm_conf>; - //single_pwm; - }; - wifi_pwm_conf:wifi_pwm_conf{ pwm_channel1_conf { pwms = <&pwm_cd MESON_PWM_1 30541 0>; duty-cycle = <15270>; diff --git a/arch/arm64/boot/dts/amlogic/a1-a113l-ad403-spk.dts b/arch/arm64/boot/dts/amlogic/a1-a113l-ad403-spk.dts index 1c1879655..c4d995e4d 100644 --- a/arch/arm64/boot/dts/amlogic/a1-a113l-ad403-spk.dts +++ b/arch/arm64/boot/dts/amlogic/a1-a113l-ad403-spk.dts @@ -806,12 +806,13 @@ status = "okay"; hostwake-gpios = <&gpio GPIOP_1 GPIO_ACTIVE_HIGH>; bt_en-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; - + reset-gpios = <&gpio GPIOX_16 GPIO_ACTIVE_HIGH>; }; &aml_wifi { status = "okay"; interrupt-gpios = <&gpio GPIOP_0 GPIO_ACTIVE_HIGH>; + power_on-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>; }; &pwm_cd { diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi index 96e345f52..f5d2a0b6f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -949,11 +949,7 @@ wifi_static_buf = <1>; //static buf level pinctrl-names = "default"; pinctrl-0 = <&pwm_d_pins1>; - pwm_config = <&wifi_pwm_conf>; - //single_pwm; - }; - wifi_pwm_conf:wifi_pwm_conf{ pwm_channel1_conf { pwms = <&pwm_cd MESON_PWM_1 30541 0>; duty-cycle = <15270>;