Merge remote-tracking branch 'imx-mxs/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / imx28-apf28dev.dts

diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
index b602494c152b3a82a89c544adffb761cf2a64820..e2efd8d89c4fb82bca3602274380c7a81a515518 100644 (file)
--- a/arch/arm/boot/dts/imx28-apf28dev.dts
+++ b/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -10,7 +10,7 @@
  */
 
 /* APF28Dev is a docking board for the APF28 SOM */
-/include/ "imx28-apf28.dts"
+#include "imx28-apf28.dts"
 
 / {
        model = "Armadeus Systems APF28Dev docking/development board";
@@ -41,30 +41,30 @@
                                hog_pins_apf28dev: hog@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x1103 /* MX28_PAD_LCD_D16__GPIO_1_16 */
-                                               0x1113 /* MX28_PAD_LCD_D17__GPIO_1_17 */
-                                               0x1123 /* MX28_PAD_LCD_D18__GPIO_1_18 */
-                                               0x1133 /* MX28_PAD_LCD_D19__GPIO_1_19 */
-                                               0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */
-                                               0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
-                                               0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
+                                               MX28_PAD_LCD_D16__GPIO_1_16
+                                               MX28_PAD_LCD_D17__GPIO_1_17
+                                               MX28_PAD_LCD_D18__GPIO_1_18
+                                               MX28_PAD_LCD_D19__GPIO_1_19
+                                               MX28_PAD_LCD_D20__GPIO_1_20
+                                               MX28_PAD_LCD_D21__GPIO_1_21
+                                               MX28_PAD_LCD_D22__GPIO_1_22
                                        >;
-                                       fsl,drive-strength = <0>;
-                                       fsl,voltage = <1>;
-                                       fsl,pull-up = <0>;
+                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
+                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                       fsl,pull-up = <MXS_PULL_DISABLE>;
                                };
 
                                lcdif_pins_apf28dev: lcdif-apf28dev@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
-                                               0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
-                                               0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
-                                               0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+                                               MX28_PAD_LCD_RD_E__LCD_VSYNC
+                                               MX28_PAD_LCD_WR_RWN__LCD_HSYNC
+                                               MX28_PAD_LCD_RS__LCD_DOTCLK
+                                               MX28_PAD_LCD_CS__LCD_ENABLE
                                        >;
-                                       fsl,drive-strength = <0>;
-                                       fsl,voltage = <1>;
-                                       fsl,pull-up = <0>;
+                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
+                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                       fsl,pull-up = <MXS_PULL_DISABLE>;
                                };
                        };