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);