mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms
Exynos5, Exynos4 and S5PV210 platforms have been converted to use Device Tree and Exynos DRM driver long time ago. Remove dead platform code for these platforms and update Kconfig s3c-fb entry accordingly. Acked-by: Jingoo Han <jingoohan1@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
parent
46953e6aab
commit
7c9b845e79
@ -2025,8 +2025,7 @@ config FB_TMIO_ACCELL
|
||||
|
||||
config FB_S3C
|
||||
tristate "Samsung S3C framebuffer support"
|
||||
depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \
|
||||
ARCH_S5PV210 || ARCH_EXYNOS)
|
||||
depends on FB && (CPU_S3C2416 || ARCH_S3C64XX)
|
||||
select FB_CFB_FILLRECT
|
||||
select FB_CFB_COPYAREA
|
||||
select FB_CFB_IMAGEBLIT
|
||||
|
@ -1714,63 +1714,6 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct s3c_fb_win_variant s3c_fb_data_s5p_wins[] = {
|
||||
[0] = {
|
||||
.has_osd_c = 1,
|
||||
.osd_size_off = 0x8,
|
||||
.palette_sz = 256,
|
||||
.valid_bpp = (VALID_BPP1248 | VALID_BPP(13) |
|
||||
VALID_BPP(15) | VALID_BPP(16) |
|
||||
VALID_BPP(18) | VALID_BPP(19) |
|
||||
VALID_BPP(24) | VALID_BPP(25) |
|
||||
VALID_BPP(32)),
|
||||
},
|
||||
[1] = {
|
||||
.has_osd_c = 1,
|
||||
.has_osd_d = 1,
|
||||
.osd_size_off = 0xc,
|
||||
.has_osd_alpha = 1,
|
||||
.palette_sz = 256,
|
||||
.valid_bpp = (VALID_BPP1248 | VALID_BPP(13) |
|
||||
VALID_BPP(15) | VALID_BPP(16) |
|
||||
VALID_BPP(18) | VALID_BPP(19) |
|
||||
VALID_BPP(24) | VALID_BPP(25) |
|
||||
VALID_BPP(32)),
|
||||
},
|
||||
[2] = {
|
||||
.has_osd_c = 1,
|
||||
.has_osd_d = 1,
|
||||
.osd_size_off = 0xc,
|
||||
.has_osd_alpha = 1,
|
||||
.palette_sz = 256,
|
||||
.valid_bpp = (VALID_BPP1248 | VALID_BPP(13) |
|
||||
VALID_BPP(15) | VALID_BPP(16) |
|
||||
VALID_BPP(18) | VALID_BPP(19) |
|
||||
VALID_BPP(24) | VALID_BPP(25) |
|
||||
VALID_BPP(32)),
|
||||
},
|
||||
[3] = {
|
||||
.has_osd_c = 1,
|
||||
.has_osd_alpha = 1,
|
||||
.palette_sz = 256,
|
||||
.valid_bpp = (VALID_BPP1248 | VALID_BPP(13) |
|
||||
VALID_BPP(15) | VALID_BPP(16) |
|
||||
VALID_BPP(18) | VALID_BPP(19) |
|
||||
VALID_BPP(24) | VALID_BPP(25) |
|
||||
VALID_BPP(32)),
|
||||
},
|
||||
[4] = {
|
||||
.has_osd_c = 1,
|
||||
.has_osd_alpha = 1,
|
||||
.palette_sz = 256,
|
||||
.valid_bpp = (VALID_BPP1248 | VALID_BPP(13) |
|
||||
VALID_BPP(15) | VALID_BPP(16) |
|
||||
VALID_BPP(18) | VALID_BPP(19) |
|
||||
VALID_BPP(24) | VALID_BPP(25) |
|
||||
VALID_BPP(32)),
|
||||
},
|
||||
};
|
||||
|
||||
static struct s3c_fb_driverdata s3c_fb_data_64xx = {
|
||||
.variant = {
|
||||
.nr_windows = 5,
|
||||
@ -1802,102 +1745,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_s5pv210 = {
|
||||
.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_shadowcon = 1,
|
||||
.has_blendcon = 1,
|
||||
.has_clksel = 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],
|
||||
.win[3] = &s3c_fb_data_s5p_wins[3],
|
||||
.win[4] = &s3c_fb_data_s5p_wins[4],
|
||||
};
|
||||
|
||||
static struct s3c_fb_driverdata s3c_fb_data_exynos4 = {
|
||||
.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_shadowcon = 1,
|
||||
.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],
|
||||
.win[3] = &s3c_fb_data_s5p_wins[3],
|
||||
.win[4] = &s3c_fb_data_s5p_wins[4],
|
||||
};
|
||||
|
||||
static struct s3c_fb_driverdata s3c_fb_data_exynos5 = {
|
||||
.variant = {
|
||||
.nr_windows = 5,
|
||||
.vidtcon = FIMD_V8_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_shadowcon = 1,
|
||||
.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],
|
||||
.win[3] = &s3c_fb_data_s5p_wins[3],
|
||||
.win[4] = &s3c_fb_data_s5p_wins[4],
|
||||
};
|
||||
|
||||
/* S3C2443/S3C2416 style hardware */
|
||||
static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {
|
||||
.variant = {
|
||||
@ -1939,15 +1786,6 @@ static const struct platform_device_id s3c_fb_driver_ids[] = {
|
||||
{
|
||||
.name = "s3c-fb",
|
||||
.driver_data = (unsigned long)&s3c_fb_data_64xx,
|
||||
}, {
|
||||
.name = "s5pv210-fb",
|
||||
.driver_data = (unsigned long)&s3c_fb_data_s5pv210,
|
||||
}, {
|
||||
.name = "exynos4-fb",
|
||||
.driver_data = (unsigned long)&s3c_fb_data_exynos4,
|
||||
}, {
|
||||
.name = "exynos5-fb",
|
||||
.driver_data = (unsigned long)&s3c_fb_data_exynos5,
|
||||
}, {
|
||||
.name = "s3c2443-fb",
|
||||
.driver_data = (unsigned long)&s3c_fb_data_s3c2443,
|
||||
|
Loading…
Reference in New Issue
Block a user