提交 11c32d7b 编写于 作者: L Linus Walleij

video: move Versatile CLCD helpers

This moves the Versatile-specific helper code and panel database
down into the drivers/video folder next to the CLCD driver
itself, preserving the config symbol but also moving the header
to platform data.

This is necessary to rid the Integrator of this final <plat/*>
inclusion dependency and get us one less user of the
plat-versatile folder.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
上级 e6dc195c
...@@ -17,7 +17,6 @@ config ARCH_INTEGRATOR_CP ...@@ -17,7 +17,6 @@ config ARCH_INTEGRATOR_CP
bool "Support Integrator/CP platform" bool "Support Integrator/CP platform"
select ARCH_CINTEGRATOR select ARCH_CINTEGRATOR
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select PLAT_VERSATILE_CLCD
select SERIAL_AMBA_PL011 if TTY select SERIAL_AMBA_PL011 if TTY
select SERIAL_AMBA_PL011_CONSOLE if TTY select SERIAL_AMBA_PL011_CONSOLE if TTY
select SOC_BUS select SOC_BUS
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/kmi.h> #include <linux/amba/kmi.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/platform_data/video-clcd-versatile.h>
#include <linux/amba/mmci.h> #include <linux/amba/mmci.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip/versatile-fpga.h> #include <linux/irqchip/versatile-fpga.h>
...@@ -36,8 +37,6 @@ ...@@ -36,8 +37,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <plat/clcd.h>
#include "hardware.h" #include "hardware.h"
#include "cm.h" #include "cm.h"
#include "common.h" #include "common.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/platform_data/video-clcd-versatile.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
...@@ -48,7 +49,6 @@ ...@@ -48,7 +49,6 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <asm/hardware/timer-sp.h> #include <asm/hardware/timer-sp.h>
#include <plat/clcd.h>
#include <plat/sched_clock.h> #include <plat/sched_clock.h>
#include "core.h" #include "core.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/platform_data/video-clcd-versatile.h>
#include <linux/amba/pl061.h> #include <linux/amba/pl061.h>
#include <linux/amba/mmci.h> #include <linux/amba/mmci.h>
#include <linux/amba/pl022.h> #include <linux/amba/pl022.h>
...@@ -53,7 +54,6 @@ ...@@ -53,7 +54,6 @@
#include <mach/platform.h> #include <mach/platform.h>
#include <asm/hardware/timer-sp.h> #include <asm/hardware/timer-sp.h>
#include <plat/clcd.h>
#include <plat/sched_clock.h> #include <plat/sched_clock.h>
#include "core.h" #include "core.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/platform_data/video-clcd-versatile.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/vexpress.h> #include <linux/vexpress.h>
#include <linux/irqchip/arm-gic.h> #include <linux/irqchip/arm-gic.h>
...@@ -29,8 +30,6 @@ ...@@ -29,8 +30,6 @@
#include <mach/motherboard.h> #include <mach/motherboard.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <plat/clcd.h>
static struct map_desc ct_ca9x4_io_desc[] __initdata = { static struct map_desc ct_ca9x4_io_desc[] __initdata = {
{ {
.virtual = V2T_PERIPH, .virtual = V2T_PERIPH,
......
...@@ -3,9 +3,6 @@ if PLAT_VERSATILE ...@@ -3,9 +3,6 @@ if PLAT_VERSATILE
config PLAT_VERSATILE_CLOCK config PLAT_VERSATILE_CLOCK
bool bool
config PLAT_VERSATILE_CLCD
bool
config PLAT_VERSATILE_SCHED_CLOCK config PLAT_VERSATILE_SCHED_CLOCK
def_bool y def_bool y
......
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o
obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o
...@@ -290,6 +290,13 @@ config FB_ARMCLCD ...@@ -290,6 +290,13 @@ config FB_ARMCLCD
here and read <file:Documentation/kbuild/modules.txt>. The module here and read <file:Documentation/kbuild/modules.txt>. The module
will be called amba-clcd. will be called amba-clcd.
# Helper logic selected only by the ARM Versatile platform family.
config PLAT_VERSATILE_CLCD
depends on FB_ARMCLCD
depends on (PLAT_VERSATILE || ARCH_INTEGRATOR)
default y
bool
config FB_ACORN config FB_ACORN
bool "Acorn VIDC support" bool "Acorn VIDC support"
depends on (FB = y) && ARM && ARCH_ACORN depends on (FB = y) && ARM && ARCH_ACORN
......
...@@ -78,6 +78,7 @@ obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o ...@@ -78,6 +78,7 @@ obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
obj-$(CONFIG_PLAT_VERSATILE_CLCD) += amba-clcd-versatile.o
obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o
obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_GBE) += gbefb.o
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <plat/clcd.h> #include <linux/platform_data/video-clcd-versatile.h>
static struct clcd_panel vga = { static struct clcd_panel vga = {
.mode = { .mode = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册