diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:55:01 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:55:01 +0100 |
commit | 93363526c8fcd9dbbc0562c0642df6114ed04217 (patch) | |
tree | 3f29b9e4c49d0a265b3d6fd9e2a15f2c60d13d2f /arch/arm/boot/dts/imx28.dtsi | |
parent | 8ec1c811722b940c09961edd20bffb9eda1027c3 (diff) | |
parent | 4e556c046df2bd8d6eef6403c25bf8e52f64be93 (diff) | |
download | linux-93363526c8fcd9dbbc0562c0642df6114ed04217.tar.bz2 |
Merge tag 'mxs-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo <shawn.guo@linaro.org>:
It's mxs device tree changes for 3.8. The majority is device tree
source updates. One timer improvement and one defconfig update are
also included there.
* tag 'mxs-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs_defconfig: Improve USB related support
ARM: mxs: apf28dev: Add I2C and SPI support
ARM: mxs: Setup scheduler clock
ARM: dts: mxs: Add hog pins to Crystalfontz boards
ARM: dts: cfa10036: Use pinctrl for power led
ARM: mxs: apf28dev: Add LCD and backlight support
ARM: mxs: apf28dev: Add pinctrl and gpios
ARM: dts: mxs: Add 16 bits LCD screen muxing options for I.MX28
ARM: dts: cfa10049: Add the DH2228FV DAC to the DTS
ARM: mxs: Add support for the Armadeus Systems APF28Dev docking board
ARM: mx28: Skip OCOTP FEC MAC setup if in DT
ARM: dts: mxs: Add PWM3 muxing options for i.MX28
ARM: mxs: Add support for the Armadeus Systems APF28 module
ARM: dts: cfa10049: Add FEC to the CFA-10049 expansion board
ARM: dts: imx23-olinuxino: Use pinctrl for gpio-led
ARM: dts: imx23-olinuxino: Remove unneeded "default-on"
ARM: dts: imx28-evk: Use pinctrl for gpio-led
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/imx28.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 55c57ea6169e..d7013f73f2e9 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -492,6 +492,16 @@ fsl,pull-up = <0>; }; + pwm3_pins_a: pwm3@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x31c0 /* MX28_PAD_PWM3__PWM_3 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + pwm4_pins_a: pwm4@0 { reg = <0>; fsl,pinmux-ids = < @@ -535,6 +545,31 @@ fsl,pull-up = <0>; }; + lcdif_16bit_pins_a: lcdif-16bit@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */ + 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */ + 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */ + 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */ + 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */ + 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */ + 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */ + 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */ + 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */ + 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */ + 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */ + 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */ + 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */ + 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */ + 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */ + 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + can0_pins_a: can0@0 { reg = <0>; fsl,pinmux-ids = < |