This LCD driver is for the LCD controller in the S3C2410/S3C2440 CPUs only. Change its name to reflect its usage and free the way to add LCD controller drivers for more recent Samsung CPUs. Signed-off-by: Juergen Beisert <jbe@xxxxxxxxxxxxxx> --- arch/arm/boards/mini2440/mini2440.c | 2 +- .../include/mach/{fb.h => s3c24xx-fb.h} | 0 drivers/video/Kconfig | 2 +- drivers/video/Makefile | 2 +- drivers/video/{s3c.c => s3c24xx.c} | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-samsung/include/mach/{fb.h => s3c24xx-fb.h} (100%) rename drivers/video/{s3c.c => s3c24xx.c} (99%) diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c index 233f337..0186465 100644 --- a/arch/arm/boards/mini2440/mini2440.c +++ b/arch/arm/boards/mini2440/mini2440.c @@ -42,7 +42,7 @@ #include <mach/s3c24xx-nand.h> #include <mach/s3c-generic.h> #include <mach/s3c-mci.h> -#include <mach/fb.h> +#include <mach/s3c24xx-fb.h> static struct s3c24x0_nand_platform_data nand_info = { .nand_timing = CALC_NFCONF_TIMING(MINI2440_TACLS, MINI2440_TWRPH0, diff --git a/arch/arm/mach-samsung/include/mach/fb.h b/arch/arm/mach-samsung/include/mach/s3c24xx-fb.h similarity index 100% rename from arch/arm/mach-samsung/include/mach/fb.h rename to arch/arm/mach-samsung/include/mach/s3c24xx-fb.h diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index df2157e..4a05af9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -27,7 +27,7 @@ config DRIVER_VIDEO_STM Say 'Y' here to enable framebuffer and splash screen support for i.MX23 and i.MX28 based systems. -config DRIVER_VIDEO_S3C +config DRIVER_VIDEO_S3C24XX bool "S3C244x framebuffer driver" depends on ARCH_S3C24xx help diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 123c46f..913c78d 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -3,5 +3,5 @@ obj-$(CONFIG_VIDEO) += fb.o obj-$(CONFIG_DRIVER_VIDEO_STM) += stm.o obj-$(CONFIG_DRIVER_VIDEO_IMX) += imx.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPU) += imx-ipu-fb.o -obj-$(CONFIG_DRIVER_VIDEO_S3C) += s3c.o +obj-$(CONFIG_DRIVER_VIDEO_S3C24XX) += s3c24xx.o obj-$(CONFIG_DRIVER_VIDEO_PXA) += pxa.o diff --git a/drivers/video/s3c.c b/drivers/video/s3c24xx.c similarity index 99% rename from drivers/video/s3c.c rename to drivers/video/s3c24xx.c index a03ec3d..75677c3 100644 --- a/drivers/video/s3c.c +++ b/drivers/video/s3c24xx.c @@ -30,9 +30,9 @@ #include <malloc.h> #include <errno.h> #include <io.h> -#include <mach/gpio.h> +#include <mach/s3c-gpio.h> #include <mach/s3c-generic.h> -#include <mach/fb.h> +#include <mach/s3c24xx-fb.h> #define LCDCON1 0x00 # define PNRMODE(x) (((x) & 3) << 5) -- 1.7.7.3 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox