浏览代码

OMAPFB: remove remaining OMAP arch checks

Now that the old omapfb driver is only omap1 display driver, there's no
need to check if the arch is omap1. This patch removes the few remaining
checks for the arch.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tomi Valkeinen 13 年之前
父节点
当前提交
ae7e1f2d0b
共有 3 个文件被更改,包括 3 次插入10 次删除
  1. 2 4
      drivers/video/omap/Makefile
  2. 0 4
      drivers/video/omap/omapfb.h
  3. 1 2
      drivers/video/omap/omapfb_main.c

+ 2 - 4
drivers/video/omap/Makefile

@@ -4,11 +4,9 @@
 
 
 obj-$(CONFIG_FB_OMAP) += omapfb.o
 obj-$(CONFIG_FB_OMAP) += omapfb.o
 
 
-objs-yy := omapfb_main.o
+objs-yy := omapfb_main.o lcdc.o
 
 
-objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o
-
-objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o
+objs-y$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o
 
 
 objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o
 objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o
 
 

+ 0 - 4
drivers/video/omap/omapfb.h

@@ -47,11 +47,7 @@
 
 
 struct omapfb_device;
 struct omapfb_device;
 
 
-#ifdef CONFIG_ARCH_OMAP1
 #define OMAPFB_PLANE_NUM		1
 #define OMAPFB_PLANE_NUM		1
-#else
-#define OMAPFB_PLANE_NUM		3
-#endif
 
 
 struct omapfb_mem_region {
 struct omapfb_mem_region {
 	u32		paddr;
 	u32		paddr;

+ 1 - 2
drivers/video/omap/omapfb_main.c

@@ -1741,8 +1741,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
 
 
 #ifdef CONFIG_FB_OMAP_DMA_TUNE
 #ifdef CONFIG_FB_OMAP_DMA_TUNE
 	/* Set DMA priority for EMIFF access to highest */
 	/* Set DMA priority for EMIFF access to highest */
-	if (cpu_class_is_omap1())
-		omap_set_dma_priority(0, OMAP_DMA_PORT_EMIFF, 15);
+	omap_set_dma_priority(0, OMAP_DMA_PORT_EMIFF, 15);
 #endif
 #endif
 
 
 	r = ctrl_change_mode(fbdev->fb_info[0]);
 	r = ctrl_change_mode(fbdev->fb_info[0]);