Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vf610-twr.dts

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index ded361075aab7a1504eadc460defc992d5402161..11d733406c7ed5f1078228b93a1837b3102eedb7 100644 (file)
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -113,6 +113,13 @@
        };
 };
 
+&esdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esdhc1>;
+       bus-width = <4>;
+       status = "okay";
+};
+
 &fec0 {
        phy-mode = "rmii";
        pinctrl-names = "default";
@@ -160,6 +167,18 @@
                        >;
                };
 
+               pinctrl_esdhc1: esdhc1grp {
+                       fsl,fsl,pins = <
+                               VF610_PAD_PTA24__ESDHC1_CLK     0x31ef
+                               VF610_PAD_PTA25__ESDHC1_CMD     0x31ef
+                               VF610_PAD_PTA26__ESDHC1_DAT0    0x31ef
+                               VF610_PAD_PTA27__ESDHC1_DAT1    0x31ef
+                               VF610_PAD_PTA28__ESDHC1_DATA2   0x31ef
+                               VF610_PAD_PTA29__ESDHC1_DAT3    0x31ef
+                               VF610_PAD_PTA7__GPIO_134        0x219d
+                       >;
+               };
+
                pinctrl_fec0: fec0grp {
                        fsl,pins = <
                                VF610_PAD_PTA6__RMII_CLKIN              0x30d1
@@ -196,6 +215,17 @@
                        >;
                };
 
+               pinctrl_pwm0: pwm0grp {
+                       fsl,pins = <
+                               VF610_PAD_PTB0__FTM0_CH0                0x1582
+                               VF610_PAD_PTB1__FTM0_CH1                0x1582
+                               VF610_PAD_PTB2__FTM0_CH2                0x1582
+                               VF610_PAD_PTB3__FTM0_CH3                0x1582
+                               VF610_PAD_PTB6__FTM0_CH6                0x1582
+                               VF610_PAD_PTB7__FTM0_CH7                0x1582
+                       >;
+               };
+
                pinctrl_sai2: sai2grp {
                        fsl,pins = <
                                VF610_PAD_PTA16__SAI2_TX_BCLK           0x02ed
@@ -217,6 +247,12 @@
        };
 };
 
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm0>;
+       status = "okay";
+};
+
 &sai2 {
        #sound-dai-cells = <0>;
        pinctrl-names = "default";