diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 11:39:27 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 11:39:27 -0500 |
| commit | 5595e755b67a963db20b74ef8e1670a6fd245ed9 (patch) | |
| tree | c261934b8ed42749ce0856f0102c1508dd5b690f /arch | |
| parent | 2d9e02cad61c49798d9d36b9d87739c279fd6b0f (diff) | |
| parent | 6c1ecba8d84841277d68140ef485335d5be28485 (diff) | |
Merge tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo:
I have to send one critical mxsfb fix through arm-soc, as FB maintainer
is unresponsive for quite a while. People start complaining the missing
of such an important fix.
* tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
video: mxsfb: fix crash when unblanking the display
ARM: dts: imx23-olinuxino: Fix IOMUX settings
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx23-olinuxino.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index 7c43b8e70b9f..e7484e4ea659 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts | |||
| @@ -39,17 +39,17 @@ | |||
| 39 | hog_pins_a: hog@0 { | 39 | hog_pins_a: hog@0 { |
| 40 | reg = <0>; | 40 | reg = <0>; |
| 41 | fsl,pinmux-ids = < | 41 | fsl,pinmux-ids = < |
| 42 | 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */ | 42 | 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */ |
| 43 | >; | 43 | >; |
| 44 | fsl,drive-strength = <0>; | 44 | fsl,drive-strength = <0>; |
| 45 | fsl,voltage = <1>; | 45 | fsl,voltage = <1>; |
| 46 | fsl,pull-up = <0>; | 46 | fsl,pull-up = <0>; |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
| 49 | led_pin_gpio0_17: led_gpio0_17@0 { | 49 | led_pin_gpio2_1: led_gpio2_1@0 { |
| 50 | reg = <0>; | 50 | reg = <0>; |
| 51 | fsl,pinmux-ids = < | 51 | fsl,pinmux-ids = < |
| 52 | 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */ | 52 | 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */ |
| 53 | >; | 53 | >; |
| 54 | fsl,drive-strength = <0>; | 54 | fsl,drive-strength = <0>; |
| 55 | fsl,voltage = <1>; | 55 | fsl,voltage = <1>; |
| @@ -110,7 +110,7 @@ | |||
| 110 | leds { | 110 | leds { |
| 111 | compatible = "gpio-leds"; | 111 | compatible = "gpio-leds"; |
| 112 | pinctrl-names = "default"; | 112 | pinctrl-names = "default"; |
| 113 | pinctrl-0 = <&led_pin_gpio0_17>; | 113 | pinctrl-0 = <&led_pin_gpio2_1>; |
| 114 | 114 | ||
| 115 | user { | 115 | user { |
| 116 | label = "green"; | 116 | label = "green"; |