ARM: dts: imx28-cfa10036: Convert to use label references
authorStefan Wahren <stefan.wahren@i2se.com>
Tue, 7 Mar 2023 18:40:02 +0000 (19:40 +0100)
committerShawn Guo <shawnguo@kernel.org>
Tue, 14 Mar 2023 06:42:34 +0000 (14:42 +0800)
These Crystal fontz board files still use node name and unit
address to reference parts from the imx28.dtsi . This causes
a lot of redundancy. So use label references in order to make
it easier to maintain.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Brian Lilly <brian@crystalfontz.com>
Cc: Michal Vokáč <michal.vokac@ysoft.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx28-cfa10036.dts
arch/arm/boot/dts/imx28-cfa10049.dts
arch/arm/boot/dts/imx28-cfa10055.dts
arch/arm/boot/dts/imx28-cfa10056.dts
arch/arm/boot/dts/imx28-cfa10057.dts
arch/arm/boot/dts/imx28-cfa10058.dts

index 85aa1cc..d004b1c 100644 (file)
                reg = <0x40000000 0x08000000>;
        };
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               ssd1306_cfa10036: ssd1306-10036@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP0_DATA7__GPIO_2_7
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               led_pins_cfa10036: leds-10036@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_AUART1_RX__GPIO_3_4
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               usb0_otg_cfa10036: otg-10036@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_GPMI_RDY0__USB0_ID
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               mmc_pwr_cfa10036: mmc_pwr_cfa10036@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               0x31c3 /*
-                                               MX28_PAD_PWM3__GPIO_3_28 */
-                                       >;
-                                       fsl,drive-strength = <0>;
-                                       fsl,voltage = <1>;
-                                       fsl,pull-up = <0>;
-                               };
-
-                       };
-
-                       ssp0: spi@80010000 {
-                               compatible = "fsl,imx28-mmc";
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&mmc0_4bit_pins_a
-                                       &mmc0_cd_cfg &mmc0_sck_cfg>;
-                               vmmc-supply = <&reg_vddio_sd0>;
-                               bus-width = <4>;
-                               status = "okay";
-                       };
-               };
-
-               apbx@80040000 {
-                       duart: serial@80074000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&duart_pins_b>;
-                               status = "okay";
-                       };
-
-                       i2c0: i2c@80058000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2c0_pins_b>;
-                               clock-frequency = <400000>;
-                               status = "okay";
-
-                               ssd1306: oled@3c {
-                                       compatible = "solomon,ssd1306fb-i2c";
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <&ssd1306_cfa10036>;
-                                       reg = <0x3c>;
-                                       reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
-                                       solomon,height = <32>;
-                                       solomon,width = <128>;
-                                       solomon,page-offset = <0>;
-                                       solomon,com-lrremap;
-                                       solomon,com-invdir;
-                                       solomon,com-offset = <32>;
-                               };
-                       };
-
-                       usbphy0: usbphy@8007c000 {
-                               status = "okay";
-                       };
-               };
-       };
-
-       ahb@80080000 {
-               usb0: usb@80080000 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&usb0_otg_cfa10036>;
-                       dr_mode = "peripheral";
-                       phy_type = "utmi";
-                       status = "okay";
-               };
-       };
-
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                gpio = <&gpio3 28 0>;
        };
 };
+
+&duart {
+       pinctrl-names = "default";
+       pinctrl-0 = <&duart_pins_b>;
+       status = "okay";
+};
+
+&i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c0_pins_b>;
+       clock-frequency = <400000>;
+       status = "okay";
+
+       ssd1306: oled@3c {
+               compatible = "solomon,ssd1306fb-i2c";
+               pinctrl-names = "default";
+               pinctrl-0 = <&ssd1306_cfa10036>;
+               reg = <0x3c>;
+               reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
+               solomon,height = <32>;
+               solomon,width = <128>;
+               solomon,page-offset = <0>;
+               solomon,com-lrremap;
+               solomon,com-invdir;
+               solomon,com-offset = <32>;
+       };
+};
+
+&pinctrl {
+       ssd1306_cfa10036: ssd1306-10036@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP0_DATA7__GPIO_2_7
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       led_pins_cfa10036: leds-10036@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_AUART1_RX__GPIO_3_4
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       usb0_otg_cfa10036: otg-10036@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_GPMI_RDY0__USB0_ID
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       mmc_pwr_cfa10036: mmc_pwr_cfa10036@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       0x31c3 /*
+                       MX28_PAD_PWM3__GPIO_3_28 */
+               >;
+               fsl,drive-strength = <0>;
+               fsl,voltage = <1>;
+               fsl,pull-up = <0>;
+       };
+};
+
+&ssp0 {
+       compatible = "fsl,imx28-mmc";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc0_4bit_pins_a
+               &mmc0_cd_cfg &mmc0_sck_cfg>;
+       vmmc-supply = <&reg_vddio_sd0>;
+       bus-width = <4>;
+       status = "okay";
+};
+
+&usb0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&usb0_otg_cfa10036>;
+       dr_mode = "peripheral";
+       phy_type = "utmi";
+       status = "okay";
+};
+
+&usbphy0 {
+       status = "okay";
+};
index 9ef0d56..94d6614 100644 (file)
                };
        };
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               usb_pins_cfa10049: usb-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_GPMI_D07__GPIO_0_7
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               i2cmux_pins_cfa10049: i2cmux-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_D22__GPIO_1_22
-                                               MX28_PAD_LCD_D23__GPIO_1_23
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               mac0_pins_cfa10049: mac0-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP2_SS2__GPIO_2_21
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               pca_pins_cfa10049: pca-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP2_SS0__GPIO_2_19
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               rotary_pins_cfa10049: rotary-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_I2C0_SCL__GPIO_3_24
-                                               MX28_PAD_I2C0_SDA__GPIO_3_25
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               rotary_btn_pins_cfa10049: rotary-btn-10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SAIF1_SDATA0__GPIO_3_26
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               spi2_pins_cfa10049: spi2-cfa10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP2_SCK__GPIO_2_16
-                                               MX28_PAD_SSP2_MOSI__GPIO_2_17
-                                               MX28_PAD_SSP2_MISO__GPIO_2_18
-                                               MX28_PAD_AUART1_TX__GPIO_3_5
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               spi3_pins_cfa10049: spi3-cfa10049@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_GPMI_RDN__GPIO_0_24
-                                               MX28_PAD_GPMI_RESETN__GPIO_0_28
-                                               MX28_PAD_GPMI_CE1N__GPIO_0_17
-                                               MX28_PAD_GPMI_ALE__GPIO_0_26
-                                               MX28_PAD_GPMI_CLE__GPIO_0_27
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               lcdif_18bit_pins_cfa10049: lcdif-18bit@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_D00__LCD_D0
-                                               MX28_PAD_LCD_D01__LCD_D1
-                                               MX28_PAD_LCD_D02__LCD_D2
-                                               MX28_PAD_LCD_D03__LCD_D3
-                                               MX28_PAD_LCD_D04__LCD_D4
-                                               MX28_PAD_LCD_D05__LCD_D5
-                                               MX28_PAD_LCD_D06__LCD_D6
-                                               MX28_PAD_LCD_D07__LCD_D7
-                                               MX28_PAD_LCD_D08__LCD_D8
-                                               MX28_PAD_LCD_D09__LCD_D9
-                                               MX28_PAD_LCD_D10__LCD_D10
-                                               MX28_PAD_LCD_D11__LCD_D11
-                                               MX28_PAD_LCD_D12__LCD_D12
-                                               MX28_PAD_LCD_D13__LCD_D13
-                                               MX28_PAD_LCD_D14__LCD_D14
-                                               MX28_PAD_LCD_D15__LCD_D15
-                                               MX28_PAD_LCD_D16__LCD_D16
-                                               MX28_PAD_LCD_D17__LCD_D17
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10049: lcdif-evk@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               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 = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10049_pullup: lcdif-10049-pullup@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_RESET__GPIO_3_30
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               w1_gpio_pins: w1-gpio@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_D21__GPIO_1_21
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>; /* 0 will enable the keeper */
-                               };
-                       };
-
-                       lcdif@80030000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&lcdif_18bit_pins_cfa10049
-                                            &lcdif_pins_cfa10049
-                                            &lcdif_pins_cfa10049_pullup>;
-                               display = <&display0>;
-                               status = "okay";
-
-                               display0: display0 {
-                                       bits-per-pixel = <32>;
-                                       bus-width = <18>;
-
-                                       display-timings {
-                                               native-mode = <&timing0>;
-                                               timing0: timing0 {
-                                                       clock-frequency = <9216000>;
-                                                       hactive = <320>;
-                                                       vactive = <480>;
-                                                       hback-porch = <2>;
-                                                       hfront-porch = <2>;
-                                                       vback-porch = <2>;
-                                                       vfront-porch = <2>;
-                                                       hsync-len = <15>;
-                                                       vsync-len = <15>;
-                                                       hsync-active = <0>;
-                                                       vsync-active = <0>;
-                                                       de-active = <1>;
-                                                       pixelclk-active = <1>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               apbx@80040000 {
-                       pwm: pwm@80064000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pwm3_pins_b>;
-                               status = "okay";
-                       };
-
-                       i2c1: i2c@8005a000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2c1_pins_a>;
-                               status = "okay";
-                       };
-
-                       usbphy1: usbphy@8007e000 {
-                               status = "okay";
-                       };
-
-                       lradc@80050000 {
-                               status = "okay";
-                               fsl,lradc-touchscreen-wires = <4>;
-                       };
-               };
-       };
-
-       ahb@80080000 {
-               usb1: usb@80090000 {
-                       vbus-supply = <&reg_usb1_vbus>;
-                       pinctrl-0 = <&usb1_pins_a>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-       };
-
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                };
        };
 
-       ahb@80080000 {
-               mac0: ethernet@800f0000 {
-                       phy-mode = "rmii";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mac0_pins_a
-                               &mac0_pins_cfa10049>;
-                       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-                       phy-reset-duration = <100>;
-                       status = "okay";
-               };
-       };
-
        spi-2 {
                compatible = "spi-gpio";
                pinctrl-names = "default";
                gpios = <&gpio1 21 0>;
        };
 };
+
+&i2c1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_pins_a>;
+       status = "okay";
+};
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_18bit_pins_cfa10049
+                    &lcdif_pins_cfa10049
+                    &lcdif_pins_cfa10049_pullup>;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display0 {
+               bits-per-pixel = <32>;
+               bus-width = <18>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <9216000>;
+                               hactive = <320>;
+                               vactive = <480>;
+                               hback-porch = <2>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vfront-porch = <2>;
+                               hsync-len = <15>;
+                               vsync-len = <15>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&lradc {
+       fsl,lradc-touchscreen-wires = <4>;
+       status = "okay";
+};
+
+&mac0 {
+       phy-mode = "rmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mac0_pins_a
+               &mac0_pins_cfa10049>;
+       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
+       phy-reset-duration = <100>;
+       status = "okay";
+};
+
+&pinctrl {
+       usb_pins_cfa10049: usb-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_GPMI_D07__GPIO_0_7
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       i2cmux_pins_cfa10049: i2cmux-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_D22__GPIO_1_22
+                       MX28_PAD_LCD_D23__GPIO_1_23
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       mac0_pins_cfa10049: mac0-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP2_SS2__GPIO_2_21
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       pca_pins_cfa10049: pca-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP2_SS0__GPIO_2_19
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       rotary_pins_cfa10049: rotary-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_I2C0_SCL__GPIO_3_24
+                       MX28_PAD_I2C0_SDA__GPIO_3_25
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       rotary_btn_pins_cfa10049: rotary-btn-10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SAIF1_SDATA0__GPIO_3_26
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       spi2_pins_cfa10049: spi2-cfa10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP2_SCK__GPIO_2_16
+                       MX28_PAD_SSP2_MOSI__GPIO_2_17
+                       MX28_PAD_SSP2_MISO__GPIO_2_18
+                       MX28_PAD_AUART1_TX__GPIO_3_5
+               >;
+               fsl,drive-strength = <MXS_DRIVE_8mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       spi3_pins_cfa10049: spi3-cfa10049@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_GPMI_RDN__GPIO_0_24
+                       MX28_PAD_GPMI_RESETN__GPIO_0_28
+                       MX28_PAD_GPMI_CE1N__GPIO_0_17
+                       MX28_PAD_GPMI_ALE__GPIO_0_26
+                       MX28_PAD_GPMI_CLE__GPIO_0_27
+               >;
+               fsl,drive-strength = <MXS_DRIVE_8mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       lcdif_18bit_pins_cfa10049: lcdif-18bit@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_D00__LCD_D0
+                       MX28_PAD_LCD_D01__LCD_D1
+                       MX28_PAD_LCD_D02__LCD_D2
+                       MX28_PAD_LCD_D03__LCD_D3
+                       MX28_PAD_LCD_D04__LCD_D4
+                       MX28_PAD_LCD_D05__LCD_D5
+                       MX28_PAD_LCD_D06__LCD_D6
+                       MX28_PAD_LCD_D07__LCD_D7
+                       MX28_PAD_LCD_D08__LCD_D8
+                       MX28_PAD_LCD_D09__LCD_D9
+                       MX28_PAD_LCD_D10__LCD_D10
+                       MX28_PAD_LCD_D11__LCD_D11
+                       MX28_PAD_LCD_D12__LCD_D12
+                       MX28_PAD_LCD_D13__LCD_D13
+                       MX28_PAD_LCD_D14__LCD_D14
+                       MX28_PAD_LCD_D15__LCD_D15
+                       MX28_PAD_LCD_D16__LCD_D16
+                       MX28_PAD_LCD_D17__LCD_D17
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10049: lcdif-evk@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       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 = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10049_pullup: lcdif-10049-pullup@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_RESET__GPIO_3_30
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       w1_gpio_pins: w1-gpio@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_D21__GPIO_1_21
+               >;
+               fsl,drive-strength = <MXS_DRIVE_8mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>; /* 0 will enable the keeper */
+       };
+};
+
+&pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm3_pins_b>;
+       status = "okay";
+};
+
+&usb1 {
+       vbus-supply = <&reg_usb1_vbus>;
+       pinctrl-0 = <&usb1_pins_a>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usbphy1 {
+       status = "okay";
+};
index fac5bbd..42ba7da 100644 (file)
        model = "Crystalfontz CFA-10055 Board";
        compatible = "crystalfontz,cfa10055", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               spi2_pins_cfa10055: spi2-cfa10055@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP2_SCK__GPIO_2_16
-                                               MX28_PAD_SSP2_MOSI__GPIO_2_17
-                                               MX28_PAD_SSP2_MISO__GPIO_2_18
-                                               MX28_PAD_AUART1_TX__GPIO_3_5
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               lcdif_18bit_pins_cfa10055: lcdif-18bit@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_D00__LCD_D0
-                                               MX28_PAD_LCD_D01__LCD_D1
-                                               MX28_PAD_LCD_D02__LCD_D2
-                                               MX28_PAD_LCD_D03__LCD_D3
-                                               MX28_PAD_LCD_D04__LCD_D4
-                                               MX28_PAD_LCD_D05__LCD_D5
-                                               MX28_PAD_LCD_D06__LCD_D6
-                                               MX28_PAD_LCD_D07__LCD_D7
-                                               MX28_PAD_LCD_D08__LCD_D8
-                                               MX28_PAD_LCD_D09__LCD_D9
-                                               MX28_PAD_LCD_D10__LCD_D10
-                                               MX28_PAD_LCD_D11__LCD_D11
-                                               MX28_PAD_LCD_D12__LCD_D12
-                                               MX28_PAD_LCD_D13__LCD_D13
-                                               MX28_PAD_LCD_D14__LCD_D14
-                                               MX28_PAD_LCD_D15__LCD_D15
-                                               MX28_PAD_LCD_D16__LCD_D16
-                                               MX28_PAD_LCD_D17__LCD_D17
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10055: lcdif-evk@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               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 = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10055_pullup: lcdif-10055-pullup@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_RESET__GPIO_3_30
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-                       };
-
-                       lcdif@80030000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&lcdif_18bit_pins_cfa10055
-                                            &lcdif_pins_cfa10055
-                                            &lcdif_pins_cfa10055_pullup>;
-                               display = <&display0>;
-                               status = "okay";
-
-                               display0: display0 {
-                                       bits-per-pixel = <32>;
-                                       bus-width = <18>;
-
-                                       display-timings {
-                                               native-mode = <&timing0>;
-                                               timing0: timing0 {
-                                                       clock-frequency = <9216000>;
-                                                       hactive = <320>;
-                                                       vactive = <480>;
-                                                       hback-porch = <2>;
-                                                       hfront-porch = <2>;
-                                                       vback-porch = <2>;
-                                                       vfront-porch = <2>;
-                                                       hsync-len = <15>;
-                                                       vsync-len = <15>;
-                                                       hsync-active = <0>;
-                                                       vsync-active = <0>;
-                                                       de-active = <1>;
-                                                       pixelclk-active = <1>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               apbx@80040000 {
-                       lradc@80050000 {
-                               fsl,lradc-touchscreen-wires = <4>;
-                               status = "okay";
-                       };
-
-                       pwm: pwm@80064000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pwm3_pins_b>;
-                               status = "okay";
-                       };
-               };
-       };
-
        spi-2 {
                compatible = "spi-gpio";
                pinctrl-names = "default";
                default-brightness-level = <6>;
        };
 };
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_18bit_pins_cfa10055
+                    &lcdif_pins_cfa10055
+                    &lcdif_pins_cfa10055_pullup>;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display0 {
+               bits-per-pixel = <32>;
+               bus-width = <18>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <9216000>;
+                               hactive = <320>;
+                               vactive = <480>;
+                               hback-porch = <2>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vfront-porch = <2>;
+                               hsync-len = <15>;
+                               vsync-len = <15>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&lradc {
+       fsl,lradc-touchscreen-wires = <4>;
+       status = "okay";
+};
+
+&pinctrl {
+       spi2_pins_cfa10055: spi2-cfa10055@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP2_SCK__GPIO_2_16
+                       MX28_PAD_SSP2_MOSI__GPIO_2_17
+                       MX28_PAD_SSP2_MISO__GPIO_2_18
+                       MX28_PAD_AUART1_TX__GPIO_3_5
+               >;
+               fsl,drive-strength = <MXS_DRIVE_8mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       lcdif_18bit_pins_cfa10055: lcdif-18bit@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_D00__LCD_D0
+                       MX28_PAD_LCD_D01__LCD_D1
+                       MX28_PAD_LCD_D02__LCD_D2
+                       MX28_PAD_LCD_D03__LCD_D3
+                       MX28_PAD_LCD_D04__LCD_D4
+                       MX28_PAD_LCD_D05__LCD_D5
+                       MX28_PAD_LCD_D06__LCD_D6
+                       MX28_PAD_LCD_D07__LCD_D7
+                       MX28_PAD_LCD_D08__LCD_D8
+                       MX28_PAD_LCD_D09__LCD_D9
+                       MX28_PAD_LCD_D10__LCD_D10
+                       MX28_PAD_LCD_D11__LCD_D11
+                       MX28_PAD_LCD_D12__LCD_D12
+                       MX28_PAD_LCD_D13__LCD_D13
+                       MX28_PAD_LCD_D14__LCD_D14
+                       MX28_PAD_LCD_D15__LCD_D15
+                       MX28_PAD_LCD_D16__LCD_D16
+                       MX28_PAD_LCD_D17__LCD_D17
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10055: lcdif-evk@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       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 = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10055_pullup: lcdif-10055-pullup@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_RESET__GPIO_3_30
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+};
+
+&pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm3_pins_b>;
+       status = "okay";
+};
index c5f3337..0e15bdf 100644 (file)
        model = "Crystalfontz CFA-10056 Board";
        compatible = "crystalfontz,cfa10056", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               spi2_pins_cfa10056: spi2-cfa10056@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP2_SCK__GPIO_2_16
-                                               MX28_PAD_SSP2_MOSI__GPIO_2_17
-                                               MX28_PAD_SSP2_MISO__GPIO_2_18
-                                               MX28_PAD_AUART1_TX__GPIO_3_5
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-
-                               lcdif_pins_cfa10056: lcdif-10056@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               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 = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10056_pullup: lcdif-10056-pullup@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_RESET__GPIO_3_30
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_ENABLE>;
-                               };
-                       };
-
-                       lcdif@80030000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&lcdif_24bit_pins_a
-                                               &lcdif_pins_cfa10056
-                                               &lcdif_pins_cfa10056_pullup >;
-                               display = <&display0>;
-                               status = "okay";
-
-                               display0: display0 {
-                                       bits-per-pixel = <32>;
-                                       bus-width = <24>;
-
-                                       display-timings {
-                                               native-mode = <&timing0>;
-                                               timing0: timing0 {
-                                                       clock-frequency = <32000000>;
-                                                       hactive = <480>;
-                                                       vactive = <800>;
-                                                       hback-porch = <2>;
-                                                       hfront-porch = <2>;
-                                                       vback-porch = <2>;
-                                                       vfront-porch = <2>;
-                                                       hsync-len = <5>;
-                                                       vsync-len = <5>;
-                                                       hsync-active = <0>;
-                                                       vsync-active = <0>;
-                                                       de-active = <1>;
-                                                       pixelclk-active = <1>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-       };
-
        spi-2 {
                compatible = "spi-gpio";
                pinctrl-names = "default";
                };
        };
 };
+
+&pinctrl {
+       spi2_pins_cfa10056: spi2-cfa10056@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_SSP2_SCK__GPIO_2_16
+                       MX28_PAD_SSP2_MOSI__GPIO_2_17
+                       MX28_PAD_SSP2_MISO__GPIO_2_18
+                       MX28_PAD_AUART1_TX__GPIO_3_5
+               >;
+               fsl,drive-strength = <MXS_DRIVE_8mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+
+       lcdif_pins_cfa10056: lcdif-10056@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       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 = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10056_pullup: lcdif-10056-pullup@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_RESET__GPIO_3_30
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_ENABLE>;
+       };
+};
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_24bit_pins_a
+                       &lcdif_pins_cfa10056
+                       &lcdif_pins_cfa10056_pullup >;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display0 {
+               bits-per-pixel = <32>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <32000000>;
+                               hactive = <480>;
+                               vactive = <800>;
+                               hback-porch = <2>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vfront-porch = <2>;
+                               hsync-len = <5>;
+                               vsync-len = <5>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
index 2f7e479..27602c0 100644 (file)
        model = "Crystalfontz CFA-10057 Board";
        compatible = "crystalfontz,cfa10057", "crystalfontz,cfa10036", "fsl,imx28";
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               usb_pins_cfa10057: usb-10057@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_GPMI_D07__GPIO_0_7
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_18bit_pins_cfa10057: lcdif-18bit@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_LCD_D00__LCD_D0
-                                               MX28_PAD_LCD_D01__LCD_D1
-                                               MX28_PAD_LCD_D02__LCD_D2
-                                               MX28_PAD_LCD_D03__LCD_D3
-                                               MX28_PAD_LCD_D04__LCD_D4
-                                               MX28_PAD_LCD_D05__LCD_D5
-                                               MX28_PAD_LCD_D06__LCD_D6
-                                               MX28_PAD_LCD_D07__LCD_D7
-                                               MX28_PAD_LCD_D08__LCD_D8
-                                               MX28_PAD_LCD_D09__LCD_D9
-                                               MX28_PAD_LCD_D10__LCD_D10
-                                               MX28_PAD_LCD_D11__LCD_D11
-                                               MX28_PAD_LCD_D12__LCD_D12
-                                               MX28_PAD_LCD_D13__LCD_D13
-                                               MX28_PAD_LCD_D14__LCD_D14
-                                               MX28_PAD_LCD_D15__LCD_D15
-                                               MX28_PAD_LCD_D16__LCD_D16
-                                               MX28_PAD_LCD_D17__LCD_D17
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10057: lcdif-evk@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               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 = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-                       };
-
-                       lcdif@80030000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&lcdif_18bit_pins_cfa10057
-                                            &lcdif_pins_cfa10057>;
-                               display = <&display0>;
-                               status = "okay";
-
-                               display0: display0 {
-                                       bits-per-pixel = <32>;
-                                       bus-width = <18>;
-
-                                       display-timings {
-                                               native-mode = <&timing0>;
-                                               timing0: timing0 {
-                                                       clock-frequency = <30000000>;
-                                                       hactive = <480>;
-                                                       vactive = <800>;
-                                                       hfront-porch = <12>;
-                                                       hback-porch = <2>;
-                                                       vfront-porch = <5>;
-                                                       vback-porch = <3>;
-                                                       hsync-len = <2>;
-                                                       vsync-len = <2>;
-                                                       hsync-active = <0>;
-                                                       vsync-active = <0>;
-                                                       de-active = <1>;
-                                                       pixelclk-active = <1>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               apbx@80040000 {
-                       lradc@80050000 {
-                               fsl,lradc-touchscreen-wires = <4>;
-                               status = "okay";
-                       };
-
-                       pwm: pwm@80064000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pwm4_pins_a>;
-                               status = "okay";
-                       };
-
-                       i2c1: i2c@8005a000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2c1_pins_a>;
-                               status = "okay";
-                       };
-
-                       usbphy1: usbphy@8007e000 {
-                               status = "okay";
-                       };
-               };
-       };
-
-       ahb@80080000 {
-               usb1: usb@80090000 {
-                       vbus-supply = <&reg_usb1_vbus>;
-                       pinctrl-0 = <&usb1_pins_a>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-       };
-
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                };
        };
 
-       ahb@80080000 {
-               mac0: ethernet@800f0000 {
-                       phy-mode = "rmii";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mac0_pins_a>;
-                       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-                       phy-reset-duration = <100>;
-                       status = "okay";
-               };
-       };
-
        backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm 4 5000000>;
                default-brightness-level = <7>;
        };
 };
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_18bit_pins_cfa10057
+                    &lcdif_pins_cfa10057>;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display0 {
+               bits-per-pixel = <32>;
+               bus-width = <18>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <30000000>;
+                               hactive = <480>;
+                               vactive = <800>;
+                               hfront-porch = <12>;
+                               hback-porch = <2>;
+                               vfront-porch = <5>;
+                               vback-porch = <3>;
+                               hsync-len = <2>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&lradc {
+       fsl,lradc-touchscreen-wires = <4>;
+       status = "okay";
+};
+
+&i2c1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_pins_a>;
+       status = "okay";
+};
+
+&mac0 {
+       phy-mode = "rmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mac0_pins_a>;
+       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
+       phy-reset-duration = <100>;
+       status = "okay";
+};
+
+&pinctrl {
+       usb_pins_cfa10057: usb-10057@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_GPMI_D07__GPIO_0_7
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_18bit_pins_cfa10057: lcdif-18bit@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_LCD_D00__LCD_D0
+                       MX28_PAD_LCD_D01__LCD_D1
+                       MX28_PAD_LCD_D02__LCD_D2
+                       MX28_PAD_LCD_D03__LCD_D3
+                       MX28_PAD_LCD_D04__LCD_D4
+                       MX28_PAD_LCD_D05__LCD_D5
+                       MX28_PAD_LCD_D06__LCD_D6
+                       MX28_PAD_LCD_D07__LCD_D7
+                       MX28_PAD_LCD_D08__LCD_D8
+                       MX28_PAD_LCD_D09__LCD_D9
+                       MX28_PAD_LCD_D10__LCD_D10
+                       MX28_PAD_LCD_D11__LCD_D11
+                       MX28_PAD_LCD_D12__LCD_D12
+                       MX28_PAD_LCD_D13__LCD_D13
+                       MX28_PAD_LCD_D14__LCD_D14
+                       MX28_PAD_LCD_D15__LCD_D15
+                       MX28_PAD_LCD_D16__LCD_D16
+                       MX28_PAD_LCD_D17__LCD_D17
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10057: lcdif-evk@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       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 = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+};
+
+&pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm4_pins_a>;
+       status = "okay";
+};
+
+&usb1 {
+       vbus-supply = <&reg_usb1_vbus>;
+       pinctrl-0 = <&usb1_pins_a>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usbphy1 {
+       status = "okay";
+};
index 4465fd8..931c4d0 100644 (file)
        model = "Crystalfontz CFA-10058 Board";
        compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28";
 
-       apb@80000000 {
-               apbh@80000000 {
-                       pinctrl@80018000 {
-                               usb_pins_cfa10058: usb-10058@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_GPMI_D07__GPIO_0_7
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               lcdif_pins_cfa10058: lcdif-10058@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               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 = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-                       };
-
-                       lcdif@80030000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&lcdif_24bit_pins_a
-                                                &lcdif_pins_cfa10058>;
-                               display = <&display0>;
-                               status = "okay";
-
-                               display0: display0 {
-                                       bits-per-pixel = <32>;
-                                       bus-width = <24>;
-
-                                       display-timings {
-                                               native-mode = <&timing0>;
-                                               timing0: timing0 {
-                                                       clock-frequency = <30000000>;
-                                                       hactive = <800>;
-                                                       vactive = <480>;
-                                                       hback-porch = <40>;
-                                                       hfront-porch = <40>;
-                                                       vback-porch = <13>;
-                                                       vfront-porch = <29>;
-                                                       hsync-len = <8>;
-                                                       vsync-len = <8>;
-                                                       hsync-active = <0>;
-                                                       vsync-active = <0>;
-                                                       de-active = <1>;
-                                                       pixelclk-active = <1>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               apbx@80040000 {
-                       lradc@80050000 {
-                               fsl,lradc-touchscreen-wires = <4>;
-                               status = "okay";
-                       };
-
-                       pwm: pwm@80064000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pwm3_pins_b>;
-                               status = "okay";
-                       };
-
-                       usbphy1: usbphy@8007e000 {
-                               status = "okay";
-                       };
-               };
-       };
-
-       ahb@80080000 {
-               usb1: usb@80090000 {
-                       vbus-supply = <&reg_usb1_vbus>;
-                       pinctrl-0 = <&usb1_pins_a>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-       };
-
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                };
        };
 
-       ahb@80080000 {
-               mac0: ethernet@800f0000 {
-                       phy-mode = "rmii";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mac0_pins_a>;
-                       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-                       phy-reset-duration = <100>;
-                       status = "okay";
-               };
-       };
-
        backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm 3 5000000>;
                default-brightness-level = <6>;
        };
 };
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdif_24bit_pins_a
+                        &lcdif_pins_cfa10058>;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display0 {
+               bits-per-pixel = <32>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <30000000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <40>;
+                               hfront-porch = <40>;
+                               vback-porch = <13>;
+                               vfront-porch = <29>;
+                               hsync-len = <8>;
+                               vsync-len = <8>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&lradc {
+       fsl,lradc-touchscreen-wires = <4>;
+       status = "okay";
+};
+
+&mac0 {
+       phy-mode = "rmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mac0_pins_a>;
+       phy-reset-gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
+       phy-reset-duration = <100>;
+       status = "okay";
+};
+
+&pinctrl {
+       usb_pins_cfa10058: usb-10058@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       MX28_PAD_GPMI_D07__GPIO_0_7
+               >;
+               fsl,drive-strength = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+
+       lcdif_pins_cfa10058: lcdif-10058@0 {
+               reg = <0>;
+               fsl,pinmux-ids = <
+                       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 = <MXS_DRIVE_4mA>;
+               fsl,voltage = <MXS_VOLTAGE_HIGH>;
+               fsl,pull-up = <MXS_PULL_DISABLE>;
+       };
+};
+
+&pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm3_pins_b>;
+       status = "okay";
+};
+
+&usb1 {
+       vbus-supply = <&reg_usb1_vbus>;
+       pinctrl-0 = <&usb1_pins_a>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usbphy1 {
+       status = "okay";
+};