Commit 7f607455 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux 

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: OMAPFB: fix rfbi.c compile error
  OMAPFB: LCDC: change update_mode to DISABLED when going suspend
parents be1d29f5 bc092a30

drivers/video/omap/lcdc.c

+2 −12
Original line number Diff line number Diff line
@@ -572,22 +572,12 @@ static enum omapfb_update_mode omap_lcdc_get_update_mode(void) 
/* PM code called only in internal controller mode */

static void omap_lcdc_suspend(void)

{

	if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) {

		disable_controller();

		omap_stop_lcd_dma();

	}

	omap_lcdc_set_update_mode(OMAPFB_UPDATE_DISABLED);

}



static void omap_lcdc_resume(void)

{

	if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) {

		setup_regs();

		load_palette();

		setup_lcd_dma();

		set_load_mode(OMAP_LCDC_LOAD_FRAME);

		enable_irqs(OMAP_LCDC_IRQ_DONE);

		enable_controller();

	}

	omap_lcdc_set_update_mode(OMAPFB_AUTO_UPDATE);

}



static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps)

drivers/video/omap/rfbi.c

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/interrupt.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/platform_device.h>



#include "omapfb.h"

#include "dispc.h"
@@ -83,13 +84,13 @@ static inline u32 rfbi_read_reg(int idx) 


static int rfbi_get_clocks(void)

{

	rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");

	rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick");

	if (IS_ERR(rfbi.dss_ick)) {

		dev_err(rfbi.fbdev->dev, "can't get ick\n");

		return PTR_ERR(rfbi.dss_ick);

	}



	rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");

	rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");

	if (IS_ERR(rfbi.dss1_fck)) {

		dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");

		clk_put(rfbi.dss_ick);