Commit 90aeb7c0 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: DSS2: OMAPFB: fix crash when panel driver was not loaded
  OMAP: DSS2: Reject scaling settings when they cannot be supported
  OMAP: DSS2: Make check-delay-loops consistent
  OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
  video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
  OMAP: DSS2: Fix compile warning
  MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
  MAINTAINERS: change omapfb maintainer
  OMAP: OMAPFB: add dummy release function for omapdss
  OMAP: OMAPFB: fix clk_get for RFBI
  OMAP: DSS2: RFBI: convert to new kfifo API
  OMAP: DSS2: Fix crash when panel doesn't define enable_te()
  OMAP: DSS2: Collect interrupt statistics
  OMAP: DSS2: DSI: print debug DCS cmd in hex
  OMAP: DSS2: DSI: fix VC channels in send_short and send_null
parents 2c761270 807a7515

MAINTAINERS

+4 −13
Original line number Diff line number Diff line
@@ -3940,29 +3940,20 @@ S: Maintained 
F:	sound/soc/omap/



OMAP FRAMEBUFFER SUPPORT

M:	Imre Deak <imre.deak@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/video/omap/



OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)

OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org (moderated for non-subscribers)

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/omap2/dss/

F:	drivers/video/omap2/vrfb.c

F:	drivers/video/omap2/vram.c

F:	drivers/video/omap2/

F:	Documentation/arm/OMAP/DSS



OMAP FRAMEBUFFER SUPPORT (FOR DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/video/omap2/omapfb/



OMAP MMC SUPPORT

M:	Jarkko Lavinen <jarkko.lavinen@nokia.com>

L:	linux-omap@vger.kernel.org

drivers/video/omap/dispc.c

+3 −15
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ static struct { 
	struct omapfb_color_key	color_key;

} dispc;



static struct platform_device omapdss_device = {

	.name		= "omapdss",

	.id		= -1,

};



static void enable_lcd_clocks(int enable);



static void inline dispc_write_reg(int idx, u32 val)
@@ -920,20 +915,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) 


static int get_dss_clocks(void)

{

	dispc.dss_ick = clk_get(&omapdss_device.dev, "ick");

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

	if (IS_ERR(dispc.dss_ick)) {

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

		return PTR_ERR(dispc.dss_ick);

	}



	dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");

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

	if (IS_ERR(dispc.dss1_fck)) {

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

		clk_put(dispc.dss_ick);

		return PTR_ERR(dispc.dss1_fck);

	}



	dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck");

	dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");

	if (IS_ERR(dispc.dss_54m_fck)) {

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

		clk_put(dispc.dss_ick);
@@ -1385,12 +1380,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, 
	int skip_init = 0;

	int i;



	r = platform_device_register(&omapdss_device);

	if (r) {

		dev_err(fbdev->dev, "can't register omapdss device\n");

		return r;

	}



	memset(&dispc, 0, sizeof(dispc));



	dispc.base = ioremap(DISPC_BASE, SZ_1K);
@@ -1534,7 +1523,6 @@ static void omap_dispc_cleanup(void) 
	free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);

	put_dss_clocks();

	iounmap(dispc.base);

	platform_device_unregister(&omapdss_device);

}



const struct lcd_ctrl omap2_int_ctrl = {

drivers/video/omap/lcd_htcherald.c

+2 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ struct platform_driver htcherald_panel_driver = { 
	},

};



static int htcherald_panel_drv_init(void)

static int __init htcherald_panel_drv_init(void)

{

	return platform_driver_register(&htcherald_panel_driver);

}



static void htcherald_panel_drv_cleanup(void)

static void __exit htcherald_panel_drv_cleanup(void)

{

	platform_driver_unregister(&htcherald_panel_driver);

}

drivers/video/omap/omapfb.h

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct omapfb_device { 


	struct omapfb_mem_desc		mem_desc;

	struct fb_info			*fb_info[OMAPFB_PLANE_NUM];



	struct platform_device	*dssdev;	/* dummy dev for clocks */

};



#ifdef CONFIG_ARCH_OMAP1

drivers/video/omap/omapfb_main.c

+25 −0
Original line number Diff line number Diff line
@@ -83,6 +83,19 @@ static struct caps_table_struct color_caps[] = { 
	{ 1 << OMAPFB_COLOR_YUY422,	"YUY422", },

};



static void omapdss_release(struct device *dev)

{

}



/* dummy device for clocks */

static struct platform_device omapdss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev            = {

		.release = omapdss_release,

	},

};



/*

 * ---------------------------------------------------------------------------

 * LCD panel
@@ -1700,6 +1713,7 @@ static int omapfb_do_probe(struct platform_device *pdev, 


	fbdev->dev = &pdev->dev;

	fbdev->panel = panel;

	fbdev->dssdev = &omapdss_device;

	platform_set_drvdata(pdev, fbdev);



	mutex_init(&fbdev->rqueue_mutex);
@@ -1814,8 +1828,16 @@ cleanup: 


static int omapfb_probe(struct platform_device *pdev)

{

	int r;



	BUG_ON(fbdev_pdev != NULL);



	r = platform_device_register(&omapdss_device);

	if (r) {

		dev_err(&pdev->dev, "can't register omapdss device\n");

		return r;

	}



	/* Delay actual initialization until the LCD is registered */

	fbdev_pdev = pdev;

	if (fbdev_panel != NULL)
@@ -1843,6 +1865,9 @@ static int omapfb_remove(struct platform_device *pdev) 
	fbdev->state = OMAPFB_DISABLED;

	omapfb_free_resources(fbdev, saved_state);



	platform_device_unregister(&omapdss_device);

	fbdev->dssdev = NULL;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE