Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5595e755 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 2d9e02ca 6c1ecba8

arch/arm/boot/dts/imx23-olinuxino.dts

+4 −4
Original line number Diff line number Diff line
@@ -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";

drivers/video/mxsfb.c

+2 −1
Original line number Diff line number Diff line
@@ -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);