Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-block.git] / arch / arm / boot / dts / ste-nomadik-stn8815.dtsi

diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index c8b4a93180f8c6a24e5c89065bccf8bdefef3637..f182f6538e902e567602e5e3195d562b572b538f 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -117,7 +117,7 @@
                        mmcsd_default_mux: mmcsd_mux {
                                mmcsd_default_mux {
                                        function = "mmcsd";
-                                       groups = "mmcsd_a_1";
+                                       groups = "mmcsd_a_1", "mmcsd_b_1";
                                };
                        };
                        mmcsd_default_mode: mmcsd_default {
@@ -127,9 +127,9 @@
                                        ste,output = <0>;
                                };
                                mmcsd_default_cfg2 {
-                                       /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR */
+                                       /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR, MCDATDIR2 */
                                        pins = "GPIO10_C11", "GPIO15_A12",
-                                       "GPIO16_C13";
+                                       "GPIO16_C13", "GPIO23_D15";
                                        ste,output = <1>;
                                };
                                mmcsd_default_cfg3 {
@@ -169,21 +169,11 @@
                                };
                        };
                };
-               i2c2 {
-                       i2c2_default_mode: i2c2_default {
-                               i2c2_default_cfg {
-                                       pins = "GPIO73_C21", "GPIO74_C20";
-                                       ste,input = <0>;
-                               };
-                       };
-               };
        };
 
        src: src@101e0000 {
                compatible = "stericsson,nomadik-src";
                reg = <0x101e0000 0x1000>;
-               disable-sxtalo;
-               disable-mxtalo;
 
                /*
                 * MXTAL "Main Chrystal" is a chrystal oscillator @19.2 MHz
@@ -683,18 +673,6 @@
                };
        };
 
-       external-bus@34000000 {
-               compatible = "simple-bus";
-               reg = <0x34000000 0x1000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0 0x34000000 0x1000000>;
-               ethernet@300 {
-                       compatible = "smsc,lan91c111";
-                       reg = <0x300 0x0fd00>;
-               };
-       };
-
        /* I2C0 connected to the STw4811 power management chip */
        i2c0 {
                compatible = "st,nomadik-i2c", "arm,primecell";
@@ -749,22 +727,6 @@
                };
        };
 
-       /* I2C2 connected to the USB portions of the STw4811 only */
-       i2c2 {
-               compatible = "i2c-gpio";
-               gpios = <&gpio2 10 0>, /* sda */
-                       <&gpio2 9 0>; /* scl */
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c2_default_mode>;
-
-               stw4811@2d {
-                          compatible = "st,stw4811-usb";
-                          reg = <0x2d>;
-               };
-       };
-
        amba {
                compatible = "arm,amba-bus";
                #address-cells = <1>;
@@ -844,7 +806,6 @@
                        bus-width = <4>;
                        cap-mmc-highspeed;
                        cap-sd-highspeed;
-                       cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;
                        vmmc-supply = <&vmmc_regulator>;