diff --git a/arch/arm/boot/dts/amlogic/meson-tm2.dtsi b/arch/arm/boot/dts/amlogic/meson-tm2.dtsi index d16bd9c57..8d09f1f0f 100644 --- a/arch/arm/boot/dts/amlogic/meson-tm2.dtsi +++ b/arch/arm/boot/dts/amlogic/meson-tm2.dtsi @@ -1000,7 +1000,8 @@ aml_wifi: aml_wifi { compatible = "amlogic, aml-wifi"; status = "disabled"; - irq_trigger_type = "GPIO_IRQ_LOW"; + irq_trigger_type = "IRQF_TRIGGER_LOW"; + wifi_static_buf = <1>; /* dhd_static_buf; */ /* if use bcm wifi, config dhd_static_buf */ //pinctrl-0 = <&pwm_e_pins>; //pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts index 430b0ce26..84fcca40f 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts @@ -1842,13 +1842,12 @@ }; &aml_bt { - status = "disabled"; + status = "okay"; reset-gpios = <&gpio GPIOC_13 GPIO_ACTIVE_HIGH>; }; &aml_wifi{ - status = "disabled"; - dhd_static_buf; + status = "okay"; interrupt-gpios = <&gpio GPIOC_12 GPIO_ACTIVE_HIGH>; power_on-gpios = <&gpio GPIOC_11 GPIO_ACTIVE_HIGH>; }; @@ -1856,11 +1855,11 @@ &pwm_ab { pinctrl-names = "default"; pinctrl-0 = <&pwm_b_c_pins>; - status = "disabled"; + status = "okay"; }; &uart_A { - status = "disabled"; + status = "okay"; pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; uart-has-rtscts; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-tm2.dtsi b/arch/arm64/boot/dts/amlogic/meson-tm2.dtsi index 496d7dd0c..312423b57 100644 --- a/arch/arm64/boot/dts/amlogic/meson-tm2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-tm2.dtsi @@ -1034,7 +1034,8 @@ aml_wifi: aml_wifi { compatible = "amlogic, aml-wifi"; status = "disabled"; - irq_trigger_type = "GPIO_IRQ_LOW"; + irq_trigger_type = "IRQF_TRIGGER_LOW"; + wifi_static_buf = <1>; /* dhd_static_buf; */ /* if use bcm wifi, config dhd_static_buf */ //pinctrl-0 = <&pwm_e_pins>; //pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts index e7f5a02de..5121d1fa7 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts @@ -1054,7 +1054,7 @@ }; &sd_emmc_b { - status = "disabled"; + status = "okay"; pinctrl-0 = <&sdcard_pins>; pinctrl-1 = <&sdcard_clk_gate_pins>; pinctrl-names = "default", "clk-gate"; @@ -1838,13 +1838,12 @@ }; &aml_bt { - status = "disabled"; + status = "okay"; reset-gpios = <&gpio GPIOC_13 GPIO_ACTIVE_HIGH>; }; &aml_wifi{ - status = "disabled"; - dhd_static_buf; + status = "okay"; interrupt-gpios = <&gpio GPIOC_12 GPIO_ACTIVE_HIGH>; power_on-gpios = <&gpio GPIOC_11 GPIO_ACTIVE_HIGH>; }; @@ -1852,11 +1851,11 @@ &pwm_ab { pinctrl-names = "default"; pinctrl-0 = <&pwm_b_c_pins>; - status = "disabled"; + status = "okay"; }; &uart_A { - status = "disabled"; + status = "okay"; pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; uart-has-rtscts; };