Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / samsung / exynos5420-galaxy-tab-common.dtsi

diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
index f525b2f5e4e083ba499dc0ad11866fb78146f37c..246040967082551d4e136e3ec68f79d522c07030 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
@@ -30,6 +30,7 @@
 
        aliases {
                mmc0 = &mmc_0;
+               mmc1 = &mmc_1;
                mmc2 = &mmc_2;
        };
 
@@ -39,7 +40,7 @@
 
        memory@20000000 {
                device_type = "memory";
-               reg = <0x20000000 0xc0000000>;
+               reg = <0x20000000 0xbfa00000>;
        };
 
        firmware@2073000 {
@@ -87,6 +88,13 @@
                        linux,code = <KEY_VOLUMEDOWN>;
                };
        };
+
+       mmc1_pwrseq: pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               reset-gpios = <&gpy7 7 GPIO_ACTIVE_LOW>;
+               clocks = <&s2mps11_osc S2MPS11_CLK_BT>;
+               clock-names = "ext_clock";
+       };
 };
 
 &cci {
@@ -620,6 +628,25 @@
        vqmmc-supply = <&ldo3_reg>;
 };
 
+/* WiFi */
+&mmc_1 {
+       bus-width = <4>;
+       cap-sd-highspeed;
+       cap-sdio-irq;
+       card-detect-delay = <200>;
+       keep-power-in-suspend;
+       mmc-pwrseq = <&mmc1_pwrseq>;
+       non-removable;
+       pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_int>, <&sd1_bus1>,
+                   <&sd1_bus4>, <&wifi_en>;
+       pinctrl-names = "default";
+       vqmmc-supply = <&ldo2_reg>;
+       samsung,dw-mshc-ciu-div = <1>;
+       samsung,dw-mshc-ddr-timing = <0 2>;
+       samsung,dw-mshc-sdr-timing = <0 1>;
+       status = "okay";
+};
+
 /* External sdcard */
 &mmc_2 {
        status = "okay";
@@ -649,6 +676,11 @@
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
+
+       wifi_en: wifi-en-pins {
+               samsung,pins = "gpy7-7";
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+       };
 };
 
 &rtc {