Commit 719078a6 authored by Marek Vasut's avatar Marek Vasut Committed by Tony Lindgren
Browse files

OMAP1: Fix non-working LCD on OMAP310 



This patch fixes bug introduced in revision:

f8e9e984
omap1: DMA: move LCD related code from plat-omap to mach-omap1

The code introduced by this patch didn't consider any other CPUs but OMAP1510,
which rendered OMAP310 -- which has the same LCD controller -- non-working. Use
cpu_is_omap15xx() instead of cpu_is_omap1510() to squash this issue.

Bug found on Palm Zire 71 hardware.

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent daf7aabc

arch/arm/mach-omap1/lcd_dma.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ int omap_lcd_dma_running(void) 
	 * On OMAP1510, internal LCD controller will start the transfer

	 * On OMAP1510, internal LCD controller will start the transfer

	 * when it gets enabled, so assume DMA running if LCD enabled.

	 * when it gets enabled, so assume DMA running if LCD enabled.

	 */

	 */

	if (cpu_is_omap1510())

	if (cpu_is_omap15xx())

		if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)

		if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)

			return 1;

			return 1;
@@ -95,7 +95,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); 




void omap_set_lcd_dma_b1_rotation(int rotate)

void omap_set_lcd_dma_b1_rotation(int rotate)

{

{

	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		printk(KERN_ERR "DMA rotation is not supported in 1510 mode\n");

		printk(KERN_ERR "DMA rotation is not supported in 1510 mode\n");

		BUG();

		BUG();

		return;

		return;
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_rotation); 




void omap_set_lcd_dma_b1_mirror(int mirror)

void omap_set_lcd_dma_b1_mirror(int mirror)

{

{

	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		printk(KERN_ERR "DMA mirror is not supported in 1510 mode\n");

		printk(KERN_ERR "DMA mirror is not supported in 1510 mode\n");

		BUG();

		BUG();

	}

	}
@@ -116,7 +116,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); 




void omap_set_lcd_dma_b1_vxres(unsigned long vxres)

void omap_set_lcd_dma_b1_vxres(unsigned long vxres)

{

{

	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		printk(KERN_ERR "DMA virtual resulotion is not supported "

		printk(KERN_ERR "DMA virtual resulotion is not supported "

				"in 1510 mode\n");

				"in 1510 mode\n");

		BUG();

		BUG();
@@ -127,7 +127,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_vxres); 




void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale)

void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale)

{

{

	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		printk(KERN_ERR "DMA scale is not supported in 1510 mode\n");

		printk(KERN_ERR "DMA scale is not supported in 1510 mode\n");

		BUG();

		BUG();

	}

	}
@@ -177,7 +177,7 @@ static void set_b1_regs(void) 
			bottom = PIXADDR(lcd_dma.xres - 1, lcd_dma.yres - 1);

			bottom = PIXADDR(lcd_dma.xres - 1, lcd_dma.yres - 1);

			/* 1510 DMA requires the bottom address to be 2 more

			/* 1510 DMA requires the bottom address to be 2 more

			 * than the actual last memory access location. */

			 * than the actual last memory access location. */

			if (cpu_is_omap1510() &&

			if (cpu_is_omap15xx() &&

				lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32)

				lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32)

					bottom += 2;

					bottom += 2;

			ei = PIXSTEP(0, 0, 1, 0);

			ei = PIXSTEP(0, 0, 1, 0);
@@ -241,7 +241,7 @@ static void set_b1_regs(void) 
		return;	/* Suppress warning about uninitialized vars */

		return;	/* Suppress warning about uninitialized vars */

	}

	}





	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		omap_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U);

		omap_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U);

		omap_writew(top, OMAP1510_DMA_LCD_TOP_F1_L);

		omap_writew(top, OMAP1510_DMA_LCD_TOP_F1_L);

		omap_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U);

		omap_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U);
@@ -343,7 +343,7 @@ void omap_free_lcd_dma(void) 
		BUG();

		BUG();

		return;

		return;

	}

	}

	if (!cpu_is_omap1510())

	if (!cpu_is_omap15xx())

		omap_writew(omap_readw(OMAP1610_DMA_LCD_CCR) & ~1,

		omap_writew(omap_readw(OMAP1610_DMA_LCD_CCR) & ~1,

			    OMAP1610_DMA_LCD_CCR);

			    OMAP1610_DMA_LCD_CCR);

	lcd_dma.reserved = 0;

	lcd_dma.reserved = 0;
@@ -360,7 +360,7 @@ void omap_enable_lcd_dma(void) 
	 * connected. Otherwise the OMAP internal controller will

	 * connected. Otherwise the OMAP internal controller will

	 * start the transfer when it gets enabled.

	 * start the transfer when it gets enabled.

	 */

	 */

	if (cpu_is_omap1510() || !lcd_dma.ext_ctrl)

	if (cpu_is_omap15xx() || !lcd_dma.ext_ctrl)

		return;

		return;





	w = omap_readw(OMAP1610_DMA_LCD_CTRL);

	w = omap_readw(OMAP1610_DMA_LCD_CTRL);
@@ -378,14 +378,14 @@ EXPORT_SYMBOL(omap_enable_lcd_dma); 
void omap_setup_lcd_dma(void)

void omap_setup_lcd_dma(void)

{

{

	BUG_ON(lcd_dma.active);

	BUG_ON(lcd_dma.active);

	if (!cpu_is_omap1510()) {

	if (!cpu_is_omap15xx()) {

		/* Set some reasonable defaults */

		/* Set some reasonable defaults */

		omap_writew(0x5440, OMAP1610_DMA_LCD_CCR);

		omap_writew(0x5440, OMAP1610_DMA_LCD_CCR);

		omap_writew(0x9102, OMAP1610_DMA_LCD_CSDP);

		omap_writew(0x9102, OMAP1610_DMA_LCD_CSDP);

		omap_writew(0x0004, OMAP1610_DMA_LCD_LCH_CTRL);

		omap_writew(0x0004, OMAP1610_DMA_LCD_LCH_CTRL);

	}

	}

	set_b1_regs();

	set_b1_regs();

	if (!cpu_is_omap1510()) {

	if (!cpu_is_omap15xx()) {

		u16 w;

		u16 w;





		w = omap_readw(OMAP1610_DMA_LCD_CCR);

		w = omap_readw(OMAP1610_DMA_LCD_CCR);
@@ -407,7 +407,7 @@ void omap_stop_lcd_dma(void) 
	u16 w;

	u16 w;





	lcd_dma.active = 0;

	lcd_dma.active = 0;

	if (cpu_is_omap1510() || !lcd_dma.ext_ctrl)

	if (cpu_is_omap15xx() || !lcd_dma.ext_ctrl)

		return;

		return;





	w = omap_readw(OMAP1610_DMA_LCD_CCR);

	w = omap_readw(OMAP1610_DMA_LCD_CCR);