Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4412-trats2.dts

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 220cdf1..f285790 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -300,6 +300,13 @@
 
        };
 
+       wlan_pwrseq: sdhci3-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               reset-gpios = <&gpj0 0 GPIO_ACTIVE_LOW>;
+               clocks = <&max77686 MAX77686_CLK_PMIC>;
+               clock-names = "ext_clock";
+       };
+
        sound {
                compatible = "samsung,trats2-audio";
                samsung,i2s-controller = <&i2s0>;
@@ -454,7 +461,7 @@
                reg = <0>;
                vdd3-supply = <&lcd_vdd3_reg>;
                vci-supply = <&ldo25_reg>;
-               reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;
                power-on-delay= <50>;
                reset-delay = <100>;
                init-delay = <100>;
@@ -1350,6 +1357,26 @@
        status = "okay";
 };
 
+&sdhci_3 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       non-removable;
+       bus-width = <4>;
+
+       mmc-pwrseq = <&wlan_pwrseq>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
+       status = "okay";
+
+       brcmf: wifi@1 {
+               reg = <1>;
+               compatible = "brcm,bcm4329-fmac";
+               interrupt-parent = <&gpx2>;
+               interrupts = <5 IRQ_TYPE_NONE>;
+               interrupt-names = "host-wake";
+       };
+};
+
 &serial_0 {
        status = "okay";
 };