diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 08:39:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 08:39:27 -0800 |
| commit | 5595e755b67a963db20b74ef8e1670a6fd245ed9 (patch) | |
| tree | c261934b8ed42749ce0856f0102c1508dd5b690f | |
| parent | 2d9e02cad61c49798d9d36b9d87739c279fd6b0f (diff) | |
| parent | 6c1ecba8d84841277d68140ef485335d5be28485 (diff) | |
| download | linux-5595e755b67a963db20b74ef8e1670a6fd245ed9.tar.gz linux-5595e755b67a963db20b74ef8e1670a6fd245ed9.tar.bz2 linux-5595e755b67a963db20b74ef8e1670a6fd245ed9.zip | |
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
| -rw-r--r-- | arch/arm/boot/dts/imx23-olinuxino.dts | 8 | ||||
| -rw-r--r-- | drivers/video/mxsfb.c | 3 |
2 files changed, 6 insertions, 5 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 @@ hog_pins_a: hog@0 { reg = <0>; fsl,pinmux-ids = < - 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */ + 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */ >; fsl,drive-strength = <0>; fsl,voltage = <1>; fsl,pull-up = <0>; }; - led_pin_gpio0_17: led_gpio0_17@0 { + led_pin_gpio2_1: led_gpio2_1@0 { reg = <0>; fsl,pinmux-ids = < - 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */ + 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */ >; fsl,drive-strength = <0>; fsl,voltage = <1>; @@ -110,7 +110,7 @@ leds { compatible = "gpio-leds"; pinctrl-names = "default"; - pinctrl-0 = <&led_pin_gpio0_17>; + pinctrl-0 = <&led_pin_gpio2_1>; user { label = "green"; diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 49619b441500..f2a49ef772f3 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -369,7 +369,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) loop--; } - writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR); + reg = readl(host->base + LCDC_VDCTRL4); + writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4); clk_disable_unprepare(host->clk); |