ARM: dts: mxs: modify mx23/mx28 dts files to use pinctrl headers

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

diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 94c4476972c3fe3b53e3a619981acce652cda8e5..2474207951fb9d25a91a47911cf08548b20b49e6 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "imx28.dtsi"
+#include "imx28.dtsi"
 
 / {
        model = "Crystalfontz CFA-10036 Board";
@@ -23,13 +23,10 @@
        apb@80000000 {
                apbh@80000000 {
                        pinctrl@80018000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&hog_pins_cfa10036>;
-
-                               hog_pins_cfa10036: hog-10036@0 {
+                               ssd1306_cfa10036: ssd1306-10036@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */
+                                               MX28_PAD_SSP0_DATA7__GPIO_2_7
                                        >;
                                        fsl,drive-strength = <0>;
                                        fsl,voltage = <1>;
@@ -39,7 +36,7 @@
                                led_pins_cfa10036: leds-10036@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x3043 /* MX28_PAD_AUART1_RX__GPIO_3_4 */
+                                               MX28_PAD_AUART1_RX__GPIO_3_4
                                        >;
                                        fsl,drive-strength = <0>;
                                        fsl,voltage = <1>;
@@ -49,7 +46,7 @@
                                usb0_otg_cfa10036: otg-10036@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x0142 /* MX28_PAD_GPMI_READY0__USB0_ID */
+                                               MX28_PAD_GPMI_RDY0__USB0_ID
                                        >;
                                        fsl,drive-strength = <0>;
                                        fsl,voltage = <1>;
@@ -83,6 +80,8 @@
 
                                ssd1306: oled@3c {
                                        compatible = "solomon,ssd1306fb-i2c";
+                                       pinctrl-names = "default";
+                                       pinctrl-0 = <&ssd1306_cfa10036>;
                                        reg = <0x3c>;
                                        reset-gpios = <&gpio2 7 0>;
                                        solomon,height = <32>;