aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2014-07-01 18:53:17 -0400
committerKukjin Kim <kgene.kim@samsung.com>2014-07-12 18:35:15 -0400
commitf86e0add813a3cc0e338089fa6c0928f5f6dc52d (patch)
tree2059a8897c7a77bcb32a71f0d3e9a28321dfacb4 /drivers
parente393bc090088f731299def1cf466d45707cd9a6d (diff)
video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
This patch removes fimd and fb codes for s5pc100 SoC. Acked-by: Jingoo Han <jg1.han@samsung.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/Kconfig2
-rw-r--r--drivers/video/fbdev/s3c-fb.c35
2 files changed, 1 insertions, 36 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 11506e575ad0..79708b2fbfb2 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -2019,7 +2019,7 @@ config FB_TMIO_ACCELL
2019config FB_S3C 2019config FB_S3C
2020 tristate "Samsung S3C framebuffer support" 2020 tristate "Samsung S3C framebuffer support"
2021 depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \ 2021 depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \
2022 ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) 2022 ARCH_S5PV210 || ARCH_EXYNOS)
2023 select FB_CFB_FILLRECT 2023 select FB_CFB_FILLRECT
2024 select FB_CFB_COPYAREA 2024 select FB_CFB_COPYAREA
2025 select FB_CFB_IMAGEBLIT 2025 select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index a0cde41a47d5..b33abb0a433d 100644
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -1805,38 +1805,6 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx = {
1805 .win[4] = &s3c_fb_data_64xx_wins[4], 1805 .win[4] = &s3c_fb_data_64xx_wins[4],
1806}; 1806};
1807 1807
1808static struct s3c_fb_driverdata s3c_fb_data_s5pc100 = {
1809 .variant = {
1810 .nr_windows = 5,
1811 .vidtcon = VIDTCON0,
1812 .wincon = WINCON(0),
1813 .winmap = WINxMAP(0),
1814 .keycon = WKEYCON,
1815 .osd = VIDOSD_BASE,
1816 .osd_stride = 16,
1817 .buf_start = VIDW_BUF_START(0),
1818 .buf_size = VIDW_BUF_SIZE(0),
1819 .buf_end = VIDW_BUF_END(0),
1820
1821 .palette = {
1822 [0] = 0x2400,
1823 [1] = 0x2800,
1824 [2] = 0x2c00,
1825 [3] = 0x3000,
1826 [4] = 0x3400,
1827 },
1828
1829 .has_prtcon = 1,
1830 .has_blendcon = 1,
1831 .has_clksel = 1,
1832 },
1833 .win[0] = &s3c_fb_data_s5p_wins[0],
1834 .win[1] = &s3c_fb_data_s5p_wins[1],
1835 .win[2] = &s3c_fb_data_s5p_wins[2],
1836 .win[3] = &s3c_fb_data_s5p_wins[3],
1837 .win[4] = &s3c_fb_data_s5p_wins[4],
1838};
1839
1840static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = { 1808static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = {
1841 .variant = { 1809 .variant = {
1842 .nr_windows = 5, 1810 .nr_windows = 5,
@@ -1975,9 +1943,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
1975 .name = "s3c-fb", 1943 .name = "s3c-fb",
1976 .driver_data = (unsigned long)&s3c_fb_data_64xx, 1944 .driver_data = (unsigned long)&s3c_fb_data_64xx,
1977 }, { 1945 }, {
1978 .name = "s5pc100-fb",
1979 .driver_data = (unsigned long)&s3c_fb_data_s5pc100,
1980 }, {
1981 .name = "s5pv210-fb", 1946 .name = "s5pv210-fb",
1982 .driver_data = (unsigned long)&s3c_fb_data_s5pv210, 1947 .driver_data = (unsigned long)&s3c_fb_data_s5pv210,
1983 }, { 1948 }, {