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

Commit 8dc50ec7 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPFB: Remove OMAP2/3 support from old omapfb driver 



Old omapfb driver (drivers/video/omap/) is no longer used for OMAP2+
devices, and thus we can remove OMAP2+ support from it and make it an
OMAP1 omapfb driver.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fdcb6888

drivers/video/omap/Kconfig

+4 −5
Original line number Diff line number Diff line 
config FB_OMAP

	tristate "OMAP frame buffer support (EXPERIMENTAL)"

	depends on FB && (OMAP2_DSS = "n")

	depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3

	depends on FB

	depends on ARCH_OMAP1

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select TWL4030_CORE if MACH_OMAP_2430SDP

	help

          Frame buffer driver for OMAP based boards.
@@ -42,7 +41,7 @@ config FB_OMAP_LCD_MIPID 


config FB_OMAP_BOOTLOADER_INIT

	bool "Check bootloader initialization"

	depends on FB_OMAP || FB_OMAP2

	depends on FB_OMAP

	help

	  Say Y here if you want to enable checking if the bootloader has

	  already initialized the display controller. In this case the
@@ -61,7 +60,7 @@ config FB_OMAP_CONSISTENT_DMA_SIZE 


config FB_OMAP_DMA_TUNE

        bool "Set DMA SDRAM access priority high"

        depends on FB_OMAP && ARCH_OMAP1

        depends on FB_OMAP

        help

          On systems in which video memory is in system memory

          (SDRAM) this will speed up graphics DMA operations.

drivers/video/omap/Makefile

+1 −4
Original line number Diff line number Diff line 
#

# Makefile for the new OMAP framebuffer device driver

# Makefile for the OMAP1 framebuffer device driver

#



obj-$(CONFIG_FB_OMAP) += omapfb.o
@@ -7,11 +7,8 @@ obj-$(CONFIG_FB_OMAP) += omapfb.o 
objs-yy := omapfb_main.o



objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o

objs-y$(CONFIG_ARCH_OMAP2) += dispc.o

objs-y$(CONFIG_ARCH_OMAP3) += dispc.o



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

objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o



objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o

drivers/video/omap/dispc.c

deleted100644 → 0
+0 −1547

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/video/omap/dispc.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
#ifndef _DISPC_H

#define _DISPC_H



#include <linux/interrupt.h>



#define DISPC_PLANE_GFX			0

#define DISPC_PLANE_VID1		1

#define DISPC_PLANE_VID2		2



#define DISPC_RGB_1_BPP			0x00

#define DISPC_RGB_2_BPP			0x01

#define DISPC_RGB_4_BPP			0x02

#define DISPC_RGB_8_BPP			0x03

#define DISPC_RGB_12_BPP		0x04

#define DISPC_RGB_16_BPP		0x06

#define DISPC_RGB_24_BPP		0x08

#define DISPC_RGB_24_BPP_UNPACK_32	0x09

#define DISPC_YUV2_422			0x0a

#define DISPC_UYVY_422			0x0b



#define DISPC_BURST_4x32		0

#define DISPC_BURST_8x32		1

#define DISPC_BURST_16x32		2



#define DISPC_LOAD_CLUT_AND_FRAME	0x00

#define DISPC_LOAD_CLUT_ONLY		0x01

#define DISPC_LOAD_FRAME_ONLY		0x02

#define DISPC_LOAD_CLUT_ONCE_FRAME	0x03



#define DISPC_TFT_DATA_LINES_12		0

#define DISPC_TFT_DATA_LINES_16		1

#define DISPC_TFT_DATA_LINES_18		2

#define DISPC_TFT_DATA_LINES_24		3



extern void omap_dispc_set_lcd_size(int width, int height);



extern void omap_dispc_enable_lcd_out(int enable);

extern void omap_dispc_enable_digit_out(int enable);



extern int omap_dispc_request_irq(unsigned long irq_mask,

				   void (*callback)(void *data), void *data);

extern void omap_dispc_free_irq(unsigned long irq_mask,

				 void (*callback)(void *data), void *data);



extern const struct lcd_ctrl omap2_int_ctrl;

#endif

drivers/video/omap/omapfb.h

+0 −4
Original line number Diff line number Diff line
@@ -207,11 +207,7 @@ struct omapfb_device { 
	struct platform_device	*dssdev;	/* dummy dev for clocks */

};



#ifdef CONFIG_ARCH_OMAP1

extern struct lcd_ctrl omap1_lcd_ctrl;

#else

extern struct lcd_ctrl omap2_disp_ctrl;

#endif



extern void omapfb_register_panel(struct lcd_panel *panel);

extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);