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

Commit 11c32d7b authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e6dc195c

arch/arm/mach-integrator/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ config ARCH_INTEGRATOR_CP 
	bool "Support Integrator/CP platform"

	select ARCH_CINTEGRATOR

	select ARM_TIMER_SP804

	select PLAT_VERSATILE_CLCD

	select SERIAL_AMBA_PL011 if TTY

	select SERIAL_AMBA_PL011_CONSOLE if TTY

	select SOC_BUS

arch/arm/mach-integrator/integrator_cp.c

+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/kmi.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>

#include <linux/irqchip/versatile-fpga.h>
@@ -36,8 +37,6 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include <plat/clcd.h>



#include "hardware.h"

#include "cm.h"

#include "common.h"

arch/arm/mach-realview/core.c

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/interrupt.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/io.h>

#include <linux/smsc911x.h>

#include <linux/ata_platform.h>
@@ -48,7 +49,6 @@ 
#include <mach/irqs.h>

#include <asm/hardware/timer-sp.h>



#include <plat/clcd.h>

#include <plat/sched_clock.h>



#include "core.h"

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/of_platform.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>
@@ -53,7 +54,6 @@ 
#include <mach/platform.h>

#include <asm/hardware/timer-sp.h>



#include <plat/clcd.h>

#include <plat/sched_clock.h>



#include "core.h"

arch/arm/mach-vexpress/ct-ca9x4.c

+1 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/platform_device.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/clkdev.h>

#include <linux/vexpress.h>

#include <linux/irqchip/arm-gic.h>
@@ -29,8 +30,6 @@ 
#include <mach/motherboard.h>

#include <mach/irqs.h>



#include <plat/clcd.h>



static struct map_desc ct_ca9x4_io_desc[] __initdata = {

	{

		.virtual        = V2T_PERIPH,