voipac mx53: i2c1, i2c3 pinmux; 3.10 kernel

diff --git a/arch/arm/boot/dts/imx53-voipac.dts b/arch/arm/boot/dts/imx53-voipac.dts
index 873ff4c795977febfacd6710f7226326cc5337fe..56e8f2dd956cd56a29212cc93de683682ce57b8b 100644 (file)
--- a/arch/arm/boot/dts/imx53-voipac.dts
+++ b/arch/arm/boot/dts/imx53-voipac.dts
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx53.dtsi"
+#include "imx53.dtsi"
 
 / {
        model = "Freescale i.MX53 VOIPAC";
@@ -30,6 +30,18 @@
                reg = <0xb0000000 0x20000000>;
        };
 
+       regulators {
+               compatible = "simple-bus";
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+       };
+
        display@di0 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
@@ -53,8 +65,6 @@
                crtcs = <&ipu 0>;
                interface-pix-fmt = "rgb24";
                status = "okay";
-
-
        };
 };
 
@@ -66,13 +76,13 @@
                pinctrl_hog: hoggrp {
                        fsl,pins = <
                                /* Make DA9053 regulator functional */
-                               1149 0x80000000 /* MX53_PAD_GPIO_16__GPIO7_11 */
+                               MX53_PAD_GPIO_16__GPIO7_11      0x80000000
 
                                /* FEC Power enable */
-                               741 0x80000000  /* MX53_PAD_GPIO_11__GPIO4_1 */
+                               MX53_PAD_GPIO_11__GPIO4_1       0x80000000
 
                                /* FEC RST */
-                               742 0x80000000  /* MX53_PAD_GPIO_12__GPIO4_2 */
+                               MX53_PAD_GPIO_12__GPIO4_2       0x80000000
 
                        >;
                };
@@ -81,34 +91,52 @@
        disp0 {
                pinctrl_ipu_disp0_1: ipudisp0grp1 {
                        fsl,pins = <
-                               79  0x80000000  /* MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK */
-                               85  0x80000000  /* MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 */
-                               91  0x80000000  /* MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 */
-                               97  0x80000000  /* MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 */
-                               110 0x80000000  /* MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 */
-                               117 0x80000000  /* MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 */
-                               124 0x80000000  /* MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 */
-                               131 0x80000000  /* MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 */
-                               138 0x80000000  /* MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 */
-                               145 0x80000000  /* MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 */
-                               152 0x80000000  /* MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 */
-                               159 0x80000000  /* MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 */
-                               166 0x80000000  /* MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 */
-                               173 0x80000000  /* MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 */
-                               180 0x80000000  /* MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 */
-                               186 0x80000000  /* MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 */
-                               192 0x80000000  /* MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 */
-                               198 0x80000000  /* MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 */
-                               204 0x80000000  /* MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 */
-                               210 0x80000000  /* MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 */
-                               217 0x80000000  /* MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 */
-                               225 0x80000000  /* MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 */
-                               232 0x80000000  /* MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 */
-                               240 0x80000000  /* MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 */
-                               248 0x80000000  /* MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 */
-                               255 0x80000000  /* MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 */
-                               262 0x80000000  /* MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 */
-                               269 0x80000000  /* MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 */
+                               MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK  0x80000000
+                               MX53_PAD_DI0_PIN15__IPU_DI0_PIN15        0x80000000
+                               MX53_PAD_DI0_PIN2__IPU_DI0_PIN2          0x80000000
+                               MX53_PAD_DI0_PIN3__IPU_DI0_PIN3          0x80000000
+                               MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0     0x80000000
+                               MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1     0x80000000
+                               MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2     0x80000000
+                               MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3     0x80000000
+                               MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4     0x80000000
+                               MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5     0x80000000
+                               MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6     0x80000000
+                               MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7     0x80000000
+                               MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8     0x80000000
+                               MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9     0x80000000
+                               MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10   0x80000000
+                               MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11   0x80000000
+                               MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12   0x80000000
+                               MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13   0x80000000
+                               MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14   0x80000000
+                               MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15   0x80000000
+                               MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16   0x80000000
+                               MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17   0x80000000
+                               MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18   0x80000000
+                               MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19   0x80000000
+                               MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20   0x80000000
+                               MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21   0x80000000
+                               MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22   0x80000000
+                               MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23   0x80000000
+                       >;
+               };
+       };
+
+       i2c1 {
+               pinctrl_i2c1_2: i2c1grp2 {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D21__I2C1_SCL              0xc0000000
+                               MX53_PAD_EIM_D28__I2C1_SDA              0xc0000000
+                       >;
+               };
+       };
+
+       i2c3 {
+               pinctrl_i2c3_2: i2c3grp2 {
+                       fsl,pins = <
+                               MX53_PAD_GPIO_3__I2C3_SCL               0xc0000000
+                               MX53_PAD_GPIO_6__I2C3_SDA               0xc0000000
                        >;
                };
        };
@@ -122,7 +150,7 @@
 
 &i2c1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
+       pinctrl-0 = <&pinctrl_i2c1_2>;
        status = "okay";
 
        pmic: dialog@48 {
@@ -234,6 +262,12 @@
        };
 };
 
+&i2c3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+       status = "okay";
+};
+
 &fec {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_fec_1>;