ARM: tegra: dts: cardhu: enable SLINK4

[pandora-kernel.git] / arch / arm / boot / dts / tegra30-cardhu.dtsi

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index d10c9c5..bdb2a66 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -52,6 +52,22 @@
                                nvidia,pull = <2>;
                                nvidia,tristate = <0>;
                        };
+                       sdmmc3_clk_pa6 {
+                               nvidia,pins = "sdmmc3_clk_pa6";
+                               nvidia,function = "sdmmc3";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       sdmmc3_cmd_pa7 {
+                               nvidia,pins =   "sdmmc3_cmd_pa7",
+                                               "sdmmc3_dat0_pb7",
+                                               "sdmmc3_dat1_pb6",
+                                               "sdmmc3_dat2_pb5",
+                                               "sdmmc3_dat3_pb4";
+                               nvidia,function = "sdmmc3";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
                        sdmmc4_clk_pcc4 {
                                nvidia,pins =   "sdmmc4_clk_pcc4",
                                                "sdmmc4_rst_n_pcc3";
@@ -81,6 +97,15 @@
                                nvidia,pull = <0>;
                                nvidia,tristate = <0>;
                        };
+                       sdio3 {
+                               nvidia,pins = "drive_sdio3";
+                               nvidia,high-speed-mode = <0>;
+                               nvidia,schmitt = <0>;
+                               nvidia,pull-down-strength = <46>;
+                               nvidia,pull-up-strength = <42>;
+                               nvidia,slew-rate-rising = <1>;
+                               nvidia,slew-rate-falling = <1>;
+                       };
                };
        };
 
@@ -171,56 +196,41 @@
                        vccio-supply = <&vdd_ac_bat_reg>;
 
                        regulators {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               vdd1_reg: regulator@0 {
-                                       reg = <0>;
-                                       regulator-compatible = "vdd1";
+                               vdd1_reg: vdd1 {
                                        regulator-name = "vddio_ddr_1v2";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
                                        regulator-always-on;
                                };
 
-                               vdd2_reg: regulator@1 {
-                                       reg = <1>;
-                                       regulator-compatible = "vdd2";
+                               vdd2_reg: vdd2 {
                                        regulator-name = "vdd_1v5_gen";
                                        regulator-min-microvolt = <1500000>;
                                        regulator-max-microvolt = <1500000>;
                                        regulator-always-on;
                                };
 
-                               vddctrl_reg: regulator@2 {
-                                       reg = <2>;
-                                       regulator-compatible = "vddctrl";
+                               vddctrl_reg: vddctrl {
                                        regulator-name = "vdd_cpu,vdd_sys";
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1000000>;
                                        regulator-always-on;
                                };
 
-                               vio_reg: regulator@3 {
-                                       reg = <3>;
-                                       regulator-compatible = "vio";
+                               vio_reg: vio {
                                        regulator-name = "vdd_1v8_gen";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                        regulator-always-on;
                                };
 
-                               ldo1_reg: regulator@4 {
-                                       reg = <4>;
-                                       regulator-compatible = "ldo1";
+                               ldo1_reg: ldo1 {
                                        regulator-name = "vdd_pexa,vdd_pexb";
                                        regulator-min-microvolt = <1050000>;
                                        regulator-max-microvolt = <1050000>;
                                };
 
-                               ldo2_reg: regulator@5 {
-                                       reg = <5>;
-                                       regulator-compatible = "ldo2";
+                               ldo2_reg: ldo2 {
                                        regulator-name = "vdd_sata,avdd_plle";
                                        regulator-min-microvolt = <1050000>;
                                        regulator-max-microvolt = <1050000>;
@@ -228,44 +238,34 @@
 
                                /* LDO3 is not connected to anything */
 
-                               ldo4_reg: regulator@7 {
-                                       reg = <7>;
-                                       regulator-compatible = "ldo4";
+                               ldo4_reg: ldo4 {
                                        regulator-name = "vdd_rtc";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
                                        regulator-always-on;
                                };
 
-                               ldo5_reg: regulator@8 {
-                                       reg = <8>;
-                                       regulator-compatible = "ldo5";
+                               ldo5_reg: ldo5 {
                                        regulator-name = "vddio_sdmmc,avdd_vdac";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
                                        regulator-always-on;
                                };
 
-                               ldo6_reg: regulator@9 {
-                                       reg = <9>;
-                                       regulator-compatible = "ldo6";
+                               ldo6_reg: ldo6 {
                                        regulator-name = "avdd_dsi_csi,pwrdet_mipi";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
                                };
 
-                               ldo7_reg: regulator@10 {
-                                       reg = <10>;
-                                       regulator-compatible = "ldo7";
+                               ldo7_reg: ldo7 {
                                        regulator-name = "vdd_pllm,x,u,a_p_c_s";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
                                        regulator-always-on;
                                };
 
-                               ldo8_reg: regulator@11 {
-                                       reg = <11>;
-                                       regulator-compatible = "ldo8";
+                               ldo8_reg: ldo8 {
                                        regulator-name = "vdd_ddr_hs";
                                        regulator-min-microvolt = <1000000>;
                                        regulator-max-microvolt = <1000000>;
@@ -275,6 +275,16 @@
                };
        };
 
+       spi@7000da00 {
+               status = "okay";
+               spi-max-frequency = <25000000>;
+               spi-flash@1 {
+                       compatible = "winbond,w25q32";
+                       reg = <1>;
+                       spi-max-frequency = <20000000>;
+               };
+       };
+
        ahub {
                i2s@70080400 {
                        status = "okay";
@@ -409,6 +419,8 @@
                        regulator-name = "vdd_com";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+                       regulator-boot-on;
                        enable-active-high;
                        gpio = <&gpio 24 0>; /* gpio PD0 */
                        vin-supply = <&sys_3v3_reg>;