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>

diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
index 79653750448a15e278440cab7c245aa75556cc3e..1927faffb5bc716cff699d6cacf7f5d095ce0c22 100644 (file)
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@ -4,11 +4,9 @@
 
 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
 

diff --git a/drivers/video/omap/omapfb.h b/drivers/video/omap/omapfb.h
index 07fe49878892c1e141d5fe6466d86588b4886613..2921d20e4fbad2578220e439777c7fbd2932baac 100644 (file)
--- a/drivers/video/omap/omapfb.h
+++ b/drivers/video/omap/omapfb.h
@@ -47,11 +47,7 @@
 
 struct omapfb_device;
 
-#ifdef CONFIG_ARCH_OMAP1
 #define OMAPFB_PLANE_NUM               1
-#else
-#define OMAPFB_PLANE_NUM               3
-#endif
 
 struct omapfb_mem_region {
        u32             paddr;

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 3d2e14798210319dd508de88a3b6f7388cdb1342..f54b463709e9f5808f37bf4bb187da6a560fb06e 100644 (file)
--- a/drivers/video/omap/omapfb_main.c
+++ b/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
        /* 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
 
        r = ctrl_change_mode(fbdev->fb_info[0]);