Commit f86e0add authored by Kukjin Kim's avatar Kukjin Kim
Browse files

video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes 



This patch removes fimd and fb codes for s5pc100 SoC.

Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e393bc09

Documentation/devicetree/bindings/video/samsung-fimd.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Required properties: 
- compatible: value should be one of the following

		"samsung,s3c2443-fimd"; /* for S3C24XX SoCs */

		"samsung,s3c6400-fimd"; /* for S3C64XX SoCs */

		"samsung,s5pc100-fimd"; /* for S5PC100 SoC  */

		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos5250-fimd"; /* for Exynos5 SoCs */

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ config FB_TMIO_ACCELL 
config FB_S3C

	tristate "Samsung S3C framebuffer support"

	depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \

		ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)

		ARCH_S5PV210 || ARCH_EXYNOS)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

drivers/video/fbdev/s3c-fb.c

+0 −35
Original line number Diff line number Diff line
@@ -1805,38 +1805,6 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx = { 
	.win[4]	= &s3c_fb_data_64xx_wins[4],

};



static struct s3c_fb_driverdata s3c_fb_data_s5pc100 = {

	.variant = {

		.nr_windows	= 5,

		.vidtcon	= VIDTCON0,

		.wincon		= WINCON(0),

		.winmap		= WINxMAP(0),

		.keycon		= WKEYCON,

		.osd		= VIDOSD_BASE,

		.osd_stride	= 16,

		.buf_start	= VIDW_BUF_START(0),

		.buf_size	= VIDW_BUF_SIZE(0),

		.buf_end	= VIDW_BUF_END(0),



		.palette = {

			[0] = 0x2400,

			[1] = 0x2800,

			[2] = 0x2c00,

			[3] = 0x3000,

			[4] = 0x3400,

		},



		.has_prtcon	= 1,

		.has_blendcon	= 1,

		.has_clksel	= 1,

	},

	.win[0]	= &s3c_fb_data_s5p_wins[0],

	.win[1]	= &s3c_fb_data_s5p_wins[1],

	.win[2]	= &s3c_fb_data_s5p_wins[2],

	.win[3]	= &s3c_fb_data_s5p_wins[3],

	.win[4]	= &s3c_fb_data_s5p_wins[4],

};



static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = {

	.variant = {

		.nr_windows	= 5,
@@ -1974,9 +1942,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = { 
	{

		.name		= "s3c-fb",

		.driver_data	= (unsigned long)&s3c_fb_data_64xx,

	}, {

		.name		= "s5pc100-fb",

		.driver_data	= (unsigned long)&s3c_fb_data_s5pc100,

	}, {

		.name		= "s5pv210-fb",

		.driver_data	= (unsigned long)&s3c_fb_data_s5pv210,

include/video/samsung_fimd.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
#define VIDCON2_ORGYCbCr			(1 << 8)

#define VIDCON2_YUVORDCrCb			(1 << 7)



/* PRTCON (S3C6410, S5PC100)

/* PRTCON (S3C6410)

 * Might not be present in the S3C6410 documentation,

 * but tests prove it's there almost for sure; shouldn't hurt in any case.

 */