Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org...

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / sun7i-a20-bananapro.dts

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 19d63d4049de68983d08973f6f5dfc4128d82ffc..83516bc81225776a4a29779cb751f8c218389d72 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -76,6 +76,13 @@
                };
        };
 
+       wifi_pwrseq: wifi-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               pinctrl-names = "default";
+               pinctrl-0 = <&vmmc3_pin_bananapro>;
+               reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
+       };
+
        reg_gmac_3v3: gmac-3v3 {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
@@ -87,23 +94,16 @@
                enable-active-high;
                gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
        };
-
-       reg_vmmc3: vmmc3 {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&vmmc3_pin_bananapro>;
-               regulator-name = "vmmc3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               enable-active-high;
-               gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>;
-       };
 };
 
 &ahci {
        status = "okay";
 };
 
+&codec {
+       status = "okay";
+};
+
 &ehci0 {
        status = "okay";
 };
@@ -166,10 +166,19 @@
 &mmc3 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc3_pins_a>;
-       vmmc-supply = <&reg_vmmc3>;
+       vmmc-supply = <&reg_vcc3v3>;
+       mmc-pwrseq = <&wifi_pwrseq>;
        bus-width = <4>;
        non-removable;
        status = "okay";
+
+       brcmf: bcrmf@1 {
+               reg = <1>;
+               compatible = "brcm,bcm4329-fmac";
+               interrupt-parent = <&pio>;
+               interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+               interrupt-names = "host-wake";
+       };
 };
 
 &ohci0 {