Commit 042c4884 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: move lcd_dma code into omapfb driver 



The omapfb driver is split into platform specific code for omap1, and
driver code that is also specific to omap1.

Moving both parts into the driver directory simplifies the structure
and avoids the dependency on certain omap machine header files.

As mach/lcd_dma.h can not be included from include/linux/omap-dma.h
any more now, move the omap_lcd_dma_running() declaration into the
omap-dma header, which matches where it is defined.

Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6f936474

arch/arm/mach-omap1/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -57,7 +57,3 @@ obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o 
obj-$(CONFIG_ARCH_OMAP850)		+= gpio7xx.o

obj-$(CONFIG_ARCH_OMAP15XX)		+= gpio15xx.o

obj-$(CONFIG_ARCH_OMAP16XX)		+= gpio16xx.o
 


ifneq ($(CONFIG_FB_OMAP),)

obj-y += lcd_dma.o

endif

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

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * 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>

 */

#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__ */

drivers/video/fbdev/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ obj-$(CONFIG_FB_UDL) += udlfb.o 
obj-$(CONFIG_FB_SMSCUFX)	  += smscufx.o

obj-$(CONFIG_FB_XILINX)           += xilinxfb.o

obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o

obj-$(CONFIG_FB_OMAP)             += omap/

obj-y				  += omap/

obj-y                             += omap2/

obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o

obj-$(CONFIG_FB_CARMINE)          += carminefb.o

drivers/video/fbdev/omap/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 


obj-$(CONFIG_FB_OMAP) += omapfb.o



ifdef CONFIG_FB_OMAP

# must be built-in

obj-y += lcd_dma.o

endif



objs-yy := omapfb_main.o lcdc.o



objs-y$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o

arch/arm/mach-omap1/lcd_dma.c→drivers/video/fbdev/omap/lcd_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#include <linux/omap-dma.h>



#include <mach/hardware.h>

#include <mach/lcdc.h>



#include "lcdc.h"

#include "lcd_dma.h"



int omap_lcd_dma_running(void)

{