arm64: dts: meson-gxbb-vega-s95: fix WiFi/BT module support

Fix the SDIO WiFi support and add proper Bluetooth support on the
Vega S95 board.

Suggested-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 4d2aa4dc59e787c227e659488145d32125947854..9b52f3dcdd49d01454568f652a722202b9a4787b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -93,8 +93,7 @@
 
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>,
-                               <&gpio GPIOX_20 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
                clocks = <&wifi32k>;
                clock-names = "ext_clock";
        };
@@ -167,7 +166,7 @@
 /* Wireless SDIO Module */
 &sd_emmc_a {
        status = "okay";
-       pinctrl-0 = <&sdio_pins &sdio_irq_pins>;
+       pinctrl-0 = <&sdio_pins>;
        pinctrl-1 = <&sdio_clk_gate_pins>;
        pinctrl-names = "default", "clk-gate";
        #address-cells = <1>;
@@ -229,6 +228,19 @@
        vqmmc-supply = <&vddio_boot>;
 };
 
+/* This is connected to the Bluetooth module: */
+&uart_A {
+       status = "okay";
+       pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+       pinctrl-names = "default";
+
+       bluetooth {
+               compatible = "brcm,bcm43438-bt";
+               shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+/* This UART is brought out to the DB9 connector */
 &uart_AO {
        status = "okay";
        pinctrl-0 = <&uart_ao_a_pins>;