diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-13 00:20:47 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-13 00:20:47 -0400 |
commit | db6d842b8443ebac7b7b37264f992ce49dfb5208 (patch) | |
tree | 302e771043ca9fda2a5f7dc50cc54f26faa2d441 /drivers/video | |
parent | c3df51333444b7404a5b62f3e96f7a5d5b4fd2db (diff) | |
parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) |
Merge tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Merge "Samsung cleanup 2nd version for S5P SoCs for 3.17" from Kukjin Kim:
Cleanup S5P SoCs for 3.17
- removing s5p64x0 SoCs and s5pc100 SoC in mainline because
no more user and if it is required next time, it will be
supported with DT.
* tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
mtd: onenand: remove s5pc100 related onenand codes
spi: s3c64xx: remove s5pc100 related spi codes
gpio: samsung: remov s5pc100 related gpio codes
ARM: S5PC100: no more support S5PC100 SoC
video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
spi: s3c64xx: remove s5p64x0 related spi codes
gpio: samsung: remove s5p64x0 related gpio codes
ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/Kconfig | 4 | ||||
-rw-r--r-- | drivers/video/fbdev/s3c-fb.c | 65 |
2 files changed, 2 insertions, 67 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 5edc7a054e03..92026d31bb48 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig | |||
@@ -2025,8 +2025,8 @@ config FB_TMIO_ACCELL | |||
2025 | 2025 | ||
2026 | config FB_S3C | 2026 | config FB_S3C |
2027 | tristate "Samsung S3C framebuffer support" | 2027 | tristate "Samsung S3C framebuffer support" |
2028 | depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \ | 2028 | depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \ |
2029 | ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) | 2029 | ARCH_S5PV210 || ARCH_EXYNOS) |
2030 | select FB_CFB_FILLRECT | 2030 | select FB_CFB_FILLRECT |
2031 | select FB_CFB_COPYAREA | 2031 | select FB_CFB_COPYAREA |
2032 | select FB_CFB_IMAGEBLIT | 2032 | select FB_CFB_IMAGEBLIT |
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c index 62acae2694a9..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 | ||
1808 | static 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 | |||
1840 | static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = { | 1808 | static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = { |
1841 | .variant = { | 1809 | .variant = { |
1842 | .nr_windows = 5, | 1810 | .nr_windows = 5, |
@@ -1970,41 +1938,11 @@ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = { | |||
1970 | }, | 1938 | }, |
1971 | }; | 1939 | }; |
1972 | 1940 | ||
1973 | static struct s3c_fb_driverdata s3c_fb_data_s5p64x0 = { | ||
1974 | .variant = { | ||
1975 | .nr_windows = 3, | ||
1976 | .vidtcon = VIDTCON0, | ||
1977 | .wincon = WINCON(0), | ||
1978 | .winmap = WINxMAP(0), | ||
1979 | .keycon = WKEYCON, | ||
1980 | .osd = VIDOSD_BASE, | ||
1981 | .osd_stride = 16, | ||
1982 | .buf_start = VIDW_BUF_START(0), | ||
1983 | .buf_size = VIDW_BUF_SIZE(0), | ||
1984 | .buf_end = VIDW_BUF_END(0), | ||
1985 | |||
1986 | .palette = { | ||
1987 | [0] = 0x2400, | ||
1988 | [1] = 0x2800, | ||
1989 | [2] = 0x2c00, | ||
1990 | }, | ||
1991 | |||
1992 | .has_blendcon = 1, | ||
1993 | .has_fixvclk = 1, | ||
1994 | }, | ||
1995 | .win[0] = &s3c_fb_data_s5p_wins[0], | ||
1996 | .win[1] = &s3c_fb_data_s5p_wins[1], | ||
1997 | .win[2] = &s3c_fb_data_s5p_wins[2], | ||
1998 | }; | ||
1999 | |||
2000 | static struct platform_device_id s3c_fb_driver_ids[] = { | 1941 | static struct platform_device_id s3c_fb_driver_ids[] = { |
2001 | { | 1942 | { |
2002 | .name = "s3c-fb", | 1943 | .name = "s3c-fb", |
2003 | .driver_data = (unsigned long)&s3c_fb_data_64xx, | 1944 | .driver_data = (unsigned long)&s3c_fb_data_64xx, |
2004 | }, { | 1945 | }, { |
2005 | .name = "s5pc100-fb", | ||
2006 | .driver_data = (unsigned long)&s3c_fb_data_s5pc100, | ||
2007 | }, { | ||
2008 | .name = "s5pv210-fb", | 1946 | .name = "s5pv210-fb", |
2009 | .driver_data = (unsigned long)&s3c_fb_data_s5pv210, | 1947 | .driver_data = (unsigned long)&s3c_fb_data_s5pv210, |
2010 | }, { | 1948 | }, { |
@@ -2016,9 +1954,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = { | |||
2016 | }, { | 1954 | }, { |
2017 | .name = "s3c2443-fb", | 1955 | .name = "s3c2443-fb", |
2018 | .driver_data = (unsigned long)&s3c_fb_data_s3c2443, | 1956 | .driver_data = (unsigned long)&s3c_fb_data_s3c2443, |
2019 | }, { | ||
2020 | .name = "s5p64x0-fb", | ||
2021 | .driver_data = (unsigned long)&s3c_fb_data_s5p64x0, | ||
2022 | }, | 1957 | }, |
2023 | {}, | 1958 | {}, |
2024 | }; | 1959 | }; |