Skip to content

Commit

Permalink
OMAPFB: remove remaining OMAP arch checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomi Valkeinen committed Feb 23, 2012
1 parent 5f1cc13 commit ae7e1f2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
6 changes: 2 additions & 4 deletions drivers/video/omap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions drivers/video/omap/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/video/omap/omapfb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down

0 comments on commit ae7e1f2

Please sign in to comment.