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

Commit 8d72c796 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

omap1: LCD_DMA: Use some define rather than a hexadecimal 

The patch corrects the issue introduced with one of my earlier patches:
	OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set[1]
as pointed out by OMAP subsystem maintainer.

Applies on top of my prevoius patch:
  OMAP: DMA: move LCD DMA related code from plat-omap to mach-omap1[2]

Tested on Amstrad Delta
Compile tested with omap_generic_2420_defconfig

[1] http://patchwork.kernel.org/patch/57922/
[2] http://patchwork.kernel.org/patch/61952/



Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9cb87a6b

arch/arm/mach-omap1/include/mach/lcdc.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-omap1/include/mach/lcdc.h

 *

 * Extracted from drivers/video/omap/lcdc.c

 * Copyright (C) 2004 Nokia Corporation

 * Author: Imre Deak <imre.deak@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

#ifndef __MACH_LCDC_H__

#define __MACH_LCDC_H__



#define OMAP_LCDC_BASE			0xfffec000

#define OMAP_LCDC_SIZE			256

#define OMAP_LCDC_IRQ			INT_LCD_CTRL



#define OMAP_LCDC_CONTROL		(OMAP_LCDC_BASE + 0x00)

#define OMAP_LCDC_TIMING0		(OMAP_LCDC_BASE + 0x04)

#define OMAP_LCDC_TIMING1		(OMAP_LCDC_BASE + 0x08)

#define OMAP_LCDC_TIMING2		(OMAP_LCDC_BASE + 0x0c)

#define OMAP_LCDC_STATUS		(OMAP_LCDC_BASE + 0x10)

#define OMAP_LCDC_SUBPANEL		(OMAP_LCDC_BASE + 0x14)

#define OMAP_LCDC_LINE_INT		(OMAP_LCDC_BASE + 0x18)

#define OMAP_LCDC_DISPLAY_STATUS	(OMAP_LCDC_BASE + 0x1c)



#define OMAP_LCDC_STAT_DONE		(1 << 0)

#define OMAP_LCDC_STAT_VSYNC		(1 << 1)

#define OMAP_LCDC_STAT_SYNC_LOST	(1 << 2)

#define OMAP_LCDC_STAT_ABC		(1 << 3)

#define OMAP_LCDC_STAT_LINE_INT		(1 << 4)

#define OMAP_LCDC_STAT_FUF		(1 << 5)

#define OMAP_LCDC_STAT_LOADED_PALETTE	(1 << 6)



#define OMAP_LCDC_CTRL_LCD_EN		(1 << 0)

#define OMAP_LCDC_CTRL_LCD_TFT		(1 << 7)

#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL	(1 << 10)



#define OMAP_LCDC_IRQ_VSYNC		(1 << 2)

#define OMAP_LCDC_IRQ_DONE		(1 << 3)

#define OMAP_LCDC_IRQ_LOADED_PALETTE	(1 << 4)

#define OMAP_LCDC_IRQ_LINE_NIRQ		(1 << 5)

#define OMAP_LCDC_IRQ_LINE		(1 << 6)

#define OMAP_LCDC_IRQ_MASK		(((1 << 5) - 1) << 2)



#endif /* __MACH_LCDC_H__ */

arch/arm/mach-omap1/lcd_dma.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/io.h>



#include <mach/hardware.h>

#include <mach/lcdc.h>

#include <plat/dma.h>



int omap_lcd_dma_running(void)
@@ -37,7 +38,7 @@ int omap_lcd_dma_running(void) 
	 * when it gets enabled, so assume DMA running if LCD enabled.

	 */

	if (cpu_is_omap1510())

		if (omap_readw(0xfffec000 + 0x00) & (1 << 0))

		if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)

			return 1;



	/* Check if LCD DMA is running */

drivers/video/omap/lcdc.c

+1 −32
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/vmalloc.h>

#include <linux/clk.h>



#include <mach/lcdc.h>

#include <plat/dma.h>



#include <asm/mach-types.h>
@@ -39,38 +40,6 @@ 


#define MODULE_NAME			"lcdc"



#define OMAP_LCDC_BASE			0xfffec000

#define OMAP_LCDC_SIZE			256

#define OMAP_LCDC_IRQ			INT_LCD_CTRL



#define OMAP_LCDC_CONTROL		(OMAP_LCDC_BASE + 0x00)

#define OMAP_LCDC_TIMING0		(OMAP_LCDC_BASE + 0x04)

#define OMAP_LCDC_TIMING1		(OMAP_LCDC_BASE + 0x08)

#define OMAP_LCDC_TIMING2		(OMAP_LCDC_BASE + 0x0c)

#define OMAP_LCDC_STATUS		(OMAP_LCDC_BASE + 0x10)

#define OMAP_LCDC_SUBPANEL		(OMAP_LCDC_BASE + 0x14)

#define OMAP_LCDC_LINE_INT		(OMAP_LCDC_BASE + 0x18)

#define OMAP_LCDC_DISPLAY_STATUS	(OMAP_LCDC_BASE + 0x1c)



#define OMAP_LCDC_STAT_DONE		(1 << 0)

#define OMAP_LCDC_STAT_VSYNC		(1 << 1)

#define OMAP_LCDC_STAT_SYNC_LOST	(1 << 2)

#define OMAP_LCDC_STAT_ABC		(1 << 3)

#define OMAP_LCDC_STAT_LINE_INT		(1 << 4)

#define OMAP_LCDC_STAT_FUF		(1 << 5)

#define OMAP_LCDC_STAT_LOADED_PALETTE	(1 << 6)



#define OMAP_LCDC_CTRL_LCD_EN		(1 << 0)

#define OMAP_LCDC_CTRL_LCD_TFT		(1 << 7)

#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL	(1 << 10)



#define OMAP_LCDC_IRQ_VSYNC		(1 << 2)

#define OMAP_LCDC_IRQ_DONE		(1 << 3)

#define OMAP_LCDC_IRQ_LOADED_PALETTE	(1 << 4)

#define OMAP_LCDC_IRQ_LINE_NIRQ		(1 << 5)

#define OMAP_LCDC_IRQ_LINE		(1 << 6)

#define OMAP_LCDC_IRQ_MASK		(((1 << 5) - 1) << 2)



#define MAX_PALETTE_SIZE		PAGE_SIZE



enum lcdc_load_mode {