Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx6q-sabrelite.dts

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 2ce355cd05e573e81536599668a6b8f7e0e66ea7..6a000666c147fe5b01512dedcba9d320cfbf2b3a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -11,7 +11,7 @@
  */
 
 /dts-v1/;
-/include/ "imx6q.dtsi"
+#include "imx6q.dtsi"
 
 / {
        model = "Freescale i.MX6 Quad SABRE Lite Board";
@@ -91,14 +91,14 @@
        hog {
                pinctrl_hog: hoggrp {
                        fsl,pins = <
-                               1450 0x80000000 /* MX6Q_PAD_NANDF_D6__GPIO_2_6 */
-                               1458 0x80000000 /* MX6Q_PAD_NANDF_D7__GPIO_2_7 */
-                               121  0x80000000 /* MX6Q_PAD_EIM_D19__GPIO_3_19 */
-                               144  0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */
-                               152  0x80000000 /* MX6Q_PAD_EIM_D23__GPIO_3_23 */
-                               1262 0x80000000 /* MX6Q_PAD_SD3_DAT5__GPIO_7_0 */
-                               1270 0x1f0b0    /* MX6Q_PAD_SD3_DAT4__GPIO_7_1 */
-                               953  0x80000000 /* MX6Q_PAD_GPIO_0__CCM_CLKO */
+                               MX6Q_PAD_NANDF_D6__GPIO2_IO06 0x80000000
+                               MX6Q_PAD_NANDF_D7__GPIO2_IO07 0x80000000
+                               MX6Q_PAD_EIM_D19__GPIO3_IO19  0x80000000
+                               MX6Q_PAD_EIM_D22__GPIO3_IO22  0x80000000
+                               MX6Q_PAD_EIM_D23__GPIO3_IO23  0x80000000
+                               MX6Q_PAD_SD3_DAT5__GPIO7_IO00 0x80000000
+                               MX6Q_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0
+                               MX6Q_PAD_GPIO_0__CCM_CLKO1    0x80000000
                        >;
                };
        };