From c44250ef0e60e5ba592876383249889814006f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Sun, 22 Sep 2013 14:02:59 +0800 Subject: [PATCH 21/59] ARM: dts: mxs: modify mx23/mx28 dts files to use padconfig defines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Convert mx23/mx28 dts files to use the padconfig defintions from mxs-pinfunc.h. Signed-off-by: Lothar Waßmann Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx23-evk.dts | 6 +- arch/arm/boot/dts/imx23-olinuxino.dts | 12 +- arch/arm/boot/dts/imx23-stmp378x_devb.dts | 6 +- arch/arm/boot/dts/imx23.dtsi | 58 +++---- arch/arm/boot/dts/imx28-apf28dev.dts | 12 +- arch/arm/boot/dts/imx28-apx4devkit.dts | 22 +-- arch/arm/boot/dts/imx28-cfa10036.dts | 18 +-- arch/arm/boot/dts/imx28-cfa10037.dts | 12 +- arch/arm/boot/dts/imx28-cfa10049.dts | 72 ++++----- arch/arm/boot/dts/imx28-cfa10055.dts | 24 +-- arch/arm/boot/dts/imx28-cfa10056.dts | 18 +-- arch/arm/boot/dts/imx28-cfa10057.dts | 18 +-- arch/arm/boot/dts/imx28-cfa10058.dts | 12 +- arch/arm/boot/dts/imx28-evk.dts | 24 +-- arch/arm/boot/dts/imx28-m28evk.dts | 12 +- arch/arm/boot/dts/imx28-sps1.dts | 6 +- arch/arm/boot/dts/imx28.dtsi | 242 +++++++++++++++--------------- 17 files changed, 287 insertions(+), 287 deletions(-) diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index fdd8b27..1f026ad 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts @@ -50,9 +50,9 @@ MX23_PAD_PWM4__GPIO_1_30 MX23_PAD_SSP1_DETECT__SSP1_DETECT >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index f575434..526bfdb 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -42,9 +42,9 @@ fsl,pinmux-ids = < MX23_PAD_GPMI_ALE__GPIO_0_17 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; led_pin_gpio2_1: led_gpio2_1@0 { @@ -52,9 +52,9 @@ fsl,pinmux-ids = < MX23_PAD_SSP1_DETECT__GPIO_2_1 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts index 2c8a9b0..cb64e2b 100644 --- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts +++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts @@ -42,9 +42,9 @@ MX23_PAD_PWM3__GPIO_1_29 MX23_PAD_PWM4__GPIO_1_30 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; }; diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index ff96e59..87faa6e 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -141,9 +141,9 @@ MX23_PAD_PWM0__DUART_RX MX23_PAD_PWM1__DUART_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart0_pins_a: auart0@0 { @@ -154,9 +154,9 @@ MX23_PAD_AUART1_CTS__AUART1_CTS MX23_PAD_AUART1_RTS__AUART1_RTS >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart0_2pins_a: auart0-2pins@0 { @@ -165,9 +165,9 @@ MX23_PAD_I2C_SCL__AUART1_TX MX23_PAD_I2C_SDA__AUART1_RX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; gpmi_pins_a: gpmi-nand@0 { @@ -191,9 +191,9 @@ MX23_PAD_GPMI_CE1N__GPMI_CE1N MX23_PAD_GPMI_CE0N__GPMI_CE0N >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; gpmi_pins_fixup: gpmi-pins-fixup { @@ -202,7 +202,7 @@ MX23_PAD_GPMI_WRN__GPMI_WRN MX23_PAD_GPMI_RDN__GPMI_RDN >; - fsl,drive-strength = <2>; + fsl,drive-strength = ; }; mmc0_4bit_pins_a: mmc0-4bit@0 { @@ -215,9 +215,9 @@ MX23_PAD_SSP1_CMD__SSP1_CMD MX23_PAD_SSP1_SCK__SSP1_SCK >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc0_8bit_pins_a: mmc0-8bit@0 { @@ -235,9 +235,9 @@ MX23_PAD_SSP1_DETECT__SSP1_DETECT MX23_PAD_SSP1_SCK__SSP1_SCK >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc0_pins_fixup: mmc0-pins-fixup { @@ -245,7 +245,7 @@ MX23_PAD_SSP1_DETECT__SSP1_DETECT MX23_PAD_SSP1_SCK__SSP1_SCK >; - fsl,pull-up = <0>; + fsl,pull-up = ; }; pwm2_pins_a: pwm2@0 { @@ -253,9 +253,9 @@ fsl,pinmux-ids = < MX23_PAD_PWM2__PWM2 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_24bit_pins_a: lcdif-24bit@0 { @@ -290,9 +290,9 @@ MX23_PAD_LCD_HSYNC__LCD_HSYNC MX23_PAD_LCD_VSYNC__LCD_VSYNC >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; spi2_pins_a: spi2@0 { @@ -303,9 +303,9 @@ MX23_PAD_GPMI_D00__SSP2_DATA0 MX23_PAD_GPMI_D03__SSP2_DATA3 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts index 7d923cc..e2efd8d 100644 --- a/arch/arm/boot/dts/imx28-apf28dev.dts +++ b/arch/arm/boot/dts/imx28-apf28dev.dts @@ -49,9 +49,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_apf28dev: lcdif-apf28dev@0 { @@ -62,9 +62,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts index cb19dc1..6f254ca 100644 --- a/arch/arm/boot/dts/imx28-apx4devkit.dts +++ b/arch/arm/boot/dts/imx28-apx4devkit.dts @@ -48,9 +48,9 @@ MX28_PAD_LCD_RESET__GPIO_3_30 MX28_PAD_JTAG_RTCK__GPIO_4_20 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_apx4: lcdif-apx4@0 { @@ -61,9 +61,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc2_4bit_pins_apx4: mmc2-4bit-apx4@0 { @@ -76,17 +76,17 @@ MX28_PAD_SSP2_SS1__SSP2_D1 MX28_PAD_SSP2_SS2__SSP2_D2 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 { fsl,pinmux-ids = < MX28_PAD_SSP0_DATA7__SSP2_SCK >; - fsl,drive-strength = <2>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index 2474207..cabb617 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/arch/arm/boot/dts/imx28-cfa10036.dts @@ -28,9 +28,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP0_DATA7__GPIO_2_7 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; led_pins_cfa10036: leds-10036@0 { @@ -38,9 +38,9 @@ fsl,pinmux-ids = < MX28_PAD_AUART1_RX__GPIO_3_4 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; usb0_otg_cfa10036: otg-10036@0 { @@ -48,9 +48,9 @@ fsl,pinmux-ids = < MX28_PAD_GPMI_RDY0__USB0_ID >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10037.dts b/arch/arm/boot/dts/imx28-cfa10037.dts index 42a9a99..f93e9a7 100644 --- a/arch/arm/boot/dts/imx28-cfa10037.dts +++ b/arch/arm/boot/dts/imx28-cfa10037.dts @@ -27,9 +27,9 @@ fsl,pinmux-ids = < MX28_PAD_GPMI_D07__GPIO_0_7 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mac0_pins_cfa10037: mac0-10037@0 { @@ -37,9 +37,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP2_SS2__GPIO_2_21 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts index 9ee2566..7087b4b 100644 --- a/arch/arm/boot/dts/imx28-cfa10049.dts +++ b/arch/arm/boot/dts/imx28-cfa10049.dts @@ -27,9 +27,9 @@ fsl,pinmux-ids = < MX28_PAD_GPMI_D07__GPIO_0_7 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; i2cmux_pins_cfa10049: i2cmux-10049@0 { @@ -38,9 +38,9 @@ MX28_PAD_LCD_D22__GPIO_1_22 MX28_PAD_LCD_D23__GPIO_1_23 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mac0_pins_cfa10049: mac0-10049@0 { @@ -48,9 +48,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP2_SS2__GPIO_2_21 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pca_pins_cfa10049: pca-10049@0 { @@ -58,9 +58,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP2_SS0__GPIO_2_19 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; rotary_pins_cfa10049: rotary-10049@0 { @@ -69,9 +69,9 @@ MX28_PAD_I2C0_SCL__GPIO_3_24 MX28_PAD_I2C0_SDA__GPIO_3_25 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; rotary_btn_pins_cfa10049: rotary-btn-10049@0 { @@ -79,9 +79,9 @@ fsl,pinmux-ids = < MX28_PAD_SAIF1_SDATA0__GPIO_3_26 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; spi2_pins_cfa10049: spi2-cfa10049@0 { @@ -92,9 +92,9 @@ MX28_PAD_SSP2_MISO__GPIO_2_18 MX28_PAD_AUART1_TX__GPIO_3_5 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; spi3_pins_cfa10049: spi3-cfa10049@0 { @@ -106,9 +106,9 @@ MX28_PAD_GPMI_ALE__GPIO_0_26 MX28_PAD_GPMI_CLE__GPIO_0_27 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_18bit_pins_cfa10049: lcdif-18bit@0 { @@ -133,9 +133,9 @@ MX28_PAD_LCD_D16__LCD_D16 MX28_PAD_LCD_D17__LCD_D17 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10049: lcdif-evk@0 { @@ -146,9 +146,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10049_pullup: lcdif-10049-pullup@0 { @@ -156,9 +156,9 @@ fsl,pinmux-ids = < MX28_PAD_LCD_RESET__GPIO_3_30 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; w1_gpio_pins: w1-gpio@0 { @@ -166,9 +166,9 @@ fsl,pinmux-ids = < MX28_PAD_LCD_D21__GPIO_1_21 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <0>; /* 0 will enable the keeper */ + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; /* 0 will enable the keeper */ }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10055.dts b/arch/arm/boot/dts/imx28-cfa10055.dts index 8b262a2..c3900e7 100644 --- a/arch/arm/boot/dts/imx28-cfa10055.dts +++ b/arch/arm/boot/dts/imx28-cfa10055.dts @@ -31,9 +31,9 @@ MX28_PAD_SSP2_MISO__GPIO_2_18 MX28_PAD_AUART1_TX__GPIO_3_5 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_18bit_pins_cfa10055: lcdif-18bit@0 { @@ -58,9 +58,9 @@ MX28_PAD_LCD_D16__LCD_D16 MX28_PAD_LCD_D17__LCD_D17 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10055: lcdif-evk@0 { @@ -71,9 +71,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10055_pullup: lcdif-10055-pullup@0 { @@ -81,9 +81,9 @@ fsl,pinmux-ids = < MX28_PAD_LCD_RESET__GPIO_3_30 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10056.dts b/arch/arm/boot/dts/imx28-cfa10056.dts index f651998..cef959a 100644 --- a/arch/arm/boot/dts/imx28-cfa10056.dts +++ b/arch/arm/boot/dts/imx28-cfa10056.dts @@ -30,9 +30,9 @@ MX28_PAD_SSP2_MISO__GPIO_2_18 MX28_PAD_AUART1_TX__GPIO_3_5 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10056: lcdif-10056@0 { @@ -43,9 +43,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10056_pullup: lcdif-10056-pullup@0 { @@ -53,9 +53,9 @@ fsl,pinmux-ids = < MX28_PAD_LCD_RESET__GPIO_3_30 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10057.dts b/arch/arm/boot/dts/imx28-cfa10057.dts index 76430ca..3c13128 100644 --- a/arch/arm/boot/dts/imx28-cfa10057.dts +++ b/arch/arm/boot/dts/imx28-cfa10057.dts @@ -28,9 +28,9 @@ fsl,pinmux-ids = < MX28_PAD_GPMI_D07__GPIO_0_7 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_18bit_pins_cfa10057: lcdif-18bit@0 { @@ -55,9 +55,9 @@ MX28_PAD_LCD_D16__LCD_D16 MX28_PAD_LCD_D17__LCD_D17 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10057: lcdif-evk@0 { @@ -68,9 +68,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10058.dts b/arch/arm/boot/dts/imx28-cfa10058.dts index 502be77..2469d34 100644 --- a/arch/arm/boot/dts/imx28-cfa10058.dts +++ b/arch/arm/boot/dts/imx28-cfa10058.dts @@ -28,9 +28,9 @@ fsl,pinmux-ids = < MX28_PAD_GPMI_D07__GPIO_0_7 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_cfa10058: lcdif-10058@0 { @@ -41,9 +41,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 023eaf7..1f63845 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts @@ -79,9 +79,9 @@ MX28_PAD_AUART2_RX__GPIO_3_8 MX28_PAD_AUART2_TX__GPIO_3_9 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; led_pin_gpio3_5: led_gpio3_5@0 { @@ -89,9 +89,9 @@ fsl,pinmux-ids = < MX28_PAD_AUART1_TX__GPIO_3_5 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; gpmi_pins_evk: gpmi-nand-evk@0 { @@ -100,9 +100,9 @@ MX28_PAD_GPMI_CE1N__GPMI_CE1N MX28_PAD_GPMI_RDY1__GPMI_READY1 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_evk: lcdif-evk@0 { @@ -113,9 +113,9 @@ 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 = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 9f3271d..8e2477f 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -98,9 +98,9 @@ MX28_PAD_AUART3_RX__GPIO_3_12 MX28_PAD_AUART3_TX__GPIO_3_13 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_pins_m28: lcdif-m28@0 { @@ -109,9 +109,9 @@ MX28_PAD_LCD_DOTCLK__LCD_DOTCLK MX28_PAD_LCD_ENABLE__LCD_ENABLE >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts index 4613522..4870f07 100644 --- a/arch/arm/boot/dts/imx28-sps1.dts +++ b/arch/arm/boot/dts/imx28-sps1.dts @@ -33,9 +33,9 @@ MX28_PAD_GPMI_D03__GPIO_0_3 MX28_PAD_GPMI_D06__GPIO_0_6 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; }; diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 1f16193..44151f5 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -211,9 +211,9 @@ MX28_PAD_PWM0__DUART_RX MX28_PAD_PWM1__DUART_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; duart_pins_b: duart@1 { @@ -222,9 +222,9 @@ MX28_PAD_AUART0_CTS__DUART_RX MX28_PAD_AUART0_RTS__DUART_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; duart_4pins_a: duart-4pins@0 { @@ -235,9 +235,9 @@ MX28_PAD_AUART0_RX__DUART_CTS MX28_PAD_AUART0_TX__DUART_RTS >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; gpmi_pins_a: gpmi-nand@0 { @@ -259,9 +259,9 @@ MX28_PAD_GPMI_CLE__GPMI_CLE MX28_PAD_GPMI_RESETN__GPMI_RESETN >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; gpmi_status_cfg: gpmi-status-cfg { @@ -270,7 +270,7 @@ MX28_PAD_GPMI_WRN__GPMI_WRN MX28_PAD_GPMI_RESETN__GPMI_RESETN >; - fsl,drive-strength = <2>; + fsl,drive-strength = ; }; auart0_pins_a: auart0@0 { @@ -281,9 +281,9 @@ MX28_PAD_AUART0_CTS__AUART0_CTS MX28_PAD_AUART0_RTS__AUART0_RTS >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart0_2pins_a: auart0-2pins@0 { @@ -292,9 +292,9 @@ MX28_PAD_AUART0_RX__AUART0_RX MX28_PAD_AUART0_TX__AUART0_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart1_pins_a: auart1@0 { @@ -305,9 +305,9 @@ MX28_PAD_AUART1_CTS__AUART1_CTS MX28_PAD_AUART1_RTS__AUART1_RTS >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart1_2pins_a: auart1-2pins@0 { @@ -316,9 +316,9 @@ MX28_PAD_AUART1_RX__AUART1_RX MX28_PAD_AUART1_TX__AUART1_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart2_2pins_a: auart2-2pins@0 { @@ -327,9 +327,9 @@ MX28_PAD_SSP2_SCK__AUART2_RX MX28_PAD_SSP2_MOSI__AUART2_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart2_2pins_b: auart2-2pins@1 { @@ -338,9 +338,9 @@ MX28_PAD_AUART2_RX__AUART2_RX MX28_PAD_AUART2_TX__AUART2_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart3_pins_a: auart3@0 { @@ -351,9 +351,9 @@ MX28_PAD_AUART3_CTS__AUART3_CTS MX28_PAD_AUART3_RTS__AUART3_RTS >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart3_2pins_a: auart3-2pins@0 { @@ -362,9 +362,9 @@ MX28_PAD_SSP2_MISO__AUART3_RX MX28_PAD_SSP2_SS0__AUART3_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart3_2pins_b: auart3-2pins@1 { @@ -373,9 +373,9 @@ MX28_PAD_AUART3_RX__AUART3_RX MX28_PAD_AUART3_TX__AUART3_TX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; auart4_2pins_a: auart4@0 { @@ -384,9 +384,9 @@ MX28_PAD_SSP3_SCK__AUART4_TX MX28_PAD_SSP3_MOSI__AUART4_RX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mac0_pins_a: mac0@0 { @@ -402,9 +402,9 @@ MX28_PAD_ENET0_TXD1__ENET0_TXD1 MX28_PAD_ENET_CLK__CLKCTRL_ENET >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mac1_pins_a: mac1@0 { @@ -417,9 +417,9 @@ MX28_PAD_ENET0_TXD2__ENET1_TXD0 MX28_PAD_ENET0_TXD3__ENET1_TXD1 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc0_8bit_pins_a: mmc0-8bit@0 { @@ -437,9 +437,9 @@ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT MX28_PAD_SSP0_SCK__SSP0_SCK >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc0_4bit_pins_a: mmc0-4bit@0 { @@ -453,24 +453,24 @@ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT MX28_PAD_SSP0_SCK__SSP0_SCK >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; mmc0_cd_cfg: mmc0-cd-cfg { fsl,pinmux-ids = < MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT >; - fsl,pull-up = <0>; + fsl,pull-up = ; }; mmc0_sck_cfg: mmc0-sck-cfg { fsl,pinmux-ids = < MX28_PAD_SSP0_SCK__SSP0_SCK >; - fsl,drive-strength = <2>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,pull-up = ; }; i2c0_pins_a: i2c0@0 { @@ -479,9 +479,9 @@ MX28_PAD_I2C0_SCL__I2C0_SCL MX28_PAD_I2C0_SDA__I2C0_SDA >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; i2c0_pins_b: i2c0@1 { @@ -490,9 +490,9 @@ MX28_PAD_AUART0_RX__I2C0_SCL MX28_PAD_AUART0_TX__I2C0_SDA >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; i2c1_pins_a: i2c1@0 { @@ -501,9 +501,9 @@ MX28_PAD_PWM0__I2C1_SCL MX28_PAD_PWM1__I2C1_SDA >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; saif0_pins_a: saif0@0 { @@ -514,9 +514,9 @@ MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; saif0_pins_b: saif0@1 { @@ -526,9 +526,9 @@ MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; saif1_pins_a: saif1@0 { @@ -536,9 +536,9 @@ fsl,pinmux-ids = < MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0 >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pwm0_pins_a: pwm0@0 { @@ -546,9 +546,9 @@ fsl,pinmux-ids = < MX28_PAD_PWM0__PWM_0 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pwm2_pins_a: pwm2@0 { @@ -556,9 +556,9 @@ fsl,pinmux-ids = < MX28_PAD_PWM2__PWM_2 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pwm3_pins_a: pwm3@0 { @@ -566,9 +566,9 @@ fsl,pinmux-ids = < MX28_PAD_PWM3__PWM_3 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pwm3_pins_b: pwm3@1 { @@ -576,9 +576,9 @@ fsl,pinmux-ids = < MX28_PAD_SAIF0_MCLK__PWM_3 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; pwm4_pins_a: pwm4@0 { @@ -586,9 +586,9 @@ fsl,pinmux-ids = < MX28_PAD_PWM4__PWM_4 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_24bit_pins_a: lcdif-24bit@0 { @@ -619,9 +619,9 @@ MX28_PAD_LCD_D22__LCD_D22 MX28_PAD_LCD_D23__LCD_D23 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_16bit_pins_a: lcdif-16bit@0 { @@ -644,9 +644,9 @@ MX28_PAD_LCD_D14__LCD_D14 MX28_PAD_LCD_D15__LCD_D15 >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; lcdif_sync_pins_a: lcdif-sync@0 { @@ -657,9 +657,9 @@ MX28_PAD_LCD_RD_E__LCD_VSYNC MX28_PAD_LCD_WR_RWN__LCD_HSYNC >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; can0_pins_a: can0@0 { @@ -668,9 +668,9 @@ MX28_PAD_GPMI_RDY2__CAN0_TX MX28_PAD_GPMI_RDY3__CAN0_RX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; can1_pins_a: can1@0 { @@ -679,9 +679,9 @@ MX28_PAD_GPMI_CE2N__CAN1_TX MX28_PAD_GPMI_CE3N__CAN1_RX >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; spi2_pins_a: spi2@0 { @@ -692,9 +692,9 @@ MX28_PAD_SSP2_MISO__SSP2_D0 MX28_PAD_SSP2_SS0__SSP2_D3 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; spi3_pins_a: spi3@0 { @@ -707,9 +707,9 @@ MX28_PAD_SSP3_MISO__SSP3_D0 MX28_PAD_SSP3_SS0__SSP3_D3 >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; usbphy0_pins_a: usbphy0@0 { @@ -717,9 +717,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP2_SS2__USB0_OVERCURRENT >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; usbphy0_pins_b: usbphy0@1 { @@ -727,9 +727,9 @@ fsl,pinmux-ids = < MX28_PAD_AUART1_CTS__USB0_OVERCURRENT >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; usbphy1_pins_a: usbphy1@0 { @@ -737,9 +737,9 @@ fsl,pinmux-ids = < MX28_PAD_SSP2_SS1__USB1_OVERCURRENT >; - fsl,drive-strength = <2>; - fsl,voltage = <1>; - fsl,pull-up = <0>; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; }; usb0_id_pins_a: usb0id@0 { -- 1.8.4.rc3