video: fbdev: s3c-fb: remove s5p64x0 related fimd codes

This patch removes fimd codes for s5p6440 and s5p6450 SoCs.

Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

3 files changed, 1 insertions, 32 deletions

diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt
index 2dad41b689af..741f4a658abe 100644
--- a/Documentation/devicetree/bindings/video/samsung-fimd.txt
+++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt
@@ -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,s5p6440-fimd"; /* for S5P64X0 SoCs */
                 "samsung,s5pc100-fimd"; /* for S5PC100 SoC  */
                 "samsung,s5pv210-fimd"; /* for S5PV210 SoC */
                 "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 59c98bfd5a8a..11506e575ad0 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -2018,7 +2018,7 @@ config FB_TMIO_ACCELL
 
 config FB_S3C
         tristate "Samsung S3C framebuffer support"
-        depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \
+        depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \
                 ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index 62acae2694a9..a0cde41a47d5 100644
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -1970,33 +1970,6 @@ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {
         },
 };
 
-static struct s3c_fb_driverdata s3c_fb_data_s5p64x0 = {
-        .variant = {
-                .nr_windows     = 3,
-                .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,
-                },
-
-                .has_blendcon   = 1,
-                .has_fixvclk    = 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],
-};
-
 static struct platform_device_id s3c_fb_driver_ids[] = {
         {
                 .name           = "s3c-fb",
@@ -2016,9 +1989,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
         }, {
                 .name           = "s3c2443-fb",
                 .driver_data    = (unsigned long)&s3c_fb_data_s3c2443,
-        }, {
-                .name           = "s5p64x0-fb",
-                .driver_data    = (unsigned long)&s3c_fb_data_s5p64x0,
         },
         {},
 };