diff options
author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-18 15:18:01 +0200 |
---|---|---|
committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-25 07:44:15 +0200 |
commit | 1c710285537b694047e9de9b6088c2b5b79f9593 (patch) | |
tree | e6cd1c11778ed0ad49763bcb01672ed745a3bcd3 /arch/arm | |
parent | a1703f7085896a38684c3197279fc04fb6ed74ff (diff) |
ux500: mcde: Remove DPI display device
DPI display device is no longer used or supported
ST-Ericsson ID: 368801
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: If32b34580ab01c74a2b8b91961d6f267550f8252
Signed-off-by: Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34406
Reviewed-by: QATOOLS
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ux500/Kconfig-arch | 7 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 74 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 32 |
3 files changed, 0 insertions, 113 deletions
diff --git a/arch/arm/mach-ux500/Kconfig-arch b/arch/arm/mach-ux500/Kconfig-arch index d00b176301d..f619ace5635 100644 --- a/arch/arm/mach-ux500/Kconfig-arch +++ b/arch/arm/mach-ux500/Kconfig-arch @@ -29,13 +29,6 @@ config DISPLAY_GENERIC_DSI_PRIMARY help Say yes here when using a DSI display -config MCDE_DISPLAY_DPI_PRIMARY - bool "DPI display" - select MCDE_DISPLAY_DPI - depends on MACH_U8500 - help - Say yes here when using a DPI display - endchoice choice diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index 4f647f9930f..ceaffc1e203 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -173,80 +173,6 @@ static struct mcde_display_device samsung_s6d16d0_display1 = { }; #endif /* CONFIG_DISPLAY_GENERIC_DSI_SECONDARY */ -#ifdef CONFIG_MCDE_DISPLAY_DPI_PRIMARY -static struct mcde_port port0 = { - .type = MCDE_PORTTYPE_DPI, - .pixel_format = MCDE_PORTPIXFMT_DPI_24BPP, - .ifc = 0, - .link = 1, /* DPI channel B can only be on link 1 */ - .sync_src = MCDE_SYNCSRC_OFF, /* sync from output formatter */ - .update_auto_trig = true, - .phy = { - .dpi = { - .tv_mode = false, - .clock_div = 2, - .polarity = DPI_ACT_LOW_VSYNC | DPI_ACT_LOW_HSYNC, - }, - }, -}; - -static struct mcde_display_dpi_platform_data dpi_display0_pdata = {0}; -static struct ux500_pins *dpi_pins; - -static int dpi_display_platform_enable(struct mcde_display_device *ddev) -{ - int res; - - if (!dpi_pins) { - dpi_pins = ux500_pins_get("mcde-dpi"); - if (!dpi_pins) - return -EINVAL; - } - - dev_info(&ddev->dev, "%s\n", __func__); - res = ux500_pins_enable(dpi_pins); - if (res) - dev_warn(&ddev->dev, "Failure during %s\n", __func__); - - return res; -} - -static int dpi_display_platform_disable(struct mcde_display_device *ddev) -{ - int res; - - dev_info(&ddev->dev, "%s\n", __func__); - - res = ux500_pins_disable(dpi_pins); - if (res) - dev_warn(&ddev->dev, "Failure during %s\n", __func__); - - return res; - -} - -static struct mcde_display_device dpi_display0 = { - .name = "mcde_display_dpi", - .id = 0, - .port = &port0, - .chnl_id = MCDE_CHNL_B, - .fifo = MCDE_FIFO_B, -#ifdef CONFIG_MCDE_DISPLAY_PRIMARY_16BPP - .default_pixel_format = MCDE_OVLYPIXFMT_RGB565, -#else - .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, -#endif - .native_x_res = 640, - .native_y_res = 480, - /* .synchronized_update: Don't care: port is set to update_auto_trig */ - .dev = { - .platform_data = &dpi_display0_pdata, - }, - .platform_enable = dpi_display_platform_enable, - .platform_disable = dpi_display_platform_disable, -}; -#endif /* CONFIG_MCDE_DISPLAY_DPI_PRIMARY */ - #ifdef CONFIG_DISPLAY_AB8500_TERTIARY static struct mcde_port port_tvout1 = { .type = MCDE_PORTTYPE_DPI, diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 3598e8ff606..85ecfa15367 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -265,37 +265,6 @@ static UX500_PINS(mop500_pins_i2c3, GPIO230_I2C3_SCL, ); -static UX500_PINS(mop500_pins_mcde_dpi, - GPIO64_LCDB_DE, - GPIO65_LCDB_HSO, - GPIO66_LCDB_VSO, - GPIO67_LCDB_CLK, - GPIO70_LCD_D0, - GPIO71_LCD_D1, - GPIO72_LCD_D2, - GPIO73_LCD_D3, - GPIO74_LCD_D4, - GPIO75_LCD_D5, - GPIO76_LCD_D6, - GPIO77_LCD_D7, - GPIO153_LCD_D24, - GPIO154_LCD_D25, - GPIO155_LCD_D26, - GPIO156_LCD_D27, - GPIO157_LCD_D28, - GPIO158_LCD_D29, - GPIO159_LCD_D30, - GPIO160_LCD_D31, - GPIO161_LCD_D32, - GPIO162_LCD_D33, - GPIO163_LCD_D34, - GPIO164_LCD_D35, - GPIO165_LCD_D36, - GPIO166_LCD_D37, - GPIO167_LCD_D38, - GPIO168_LCD_D39, -); - static UX500_PINS(mop500_pins_mcde_tvout, GPIO78_LCD_D8, GPIO79_LCD_D9, @@ -420,7 +389,6 @@ static UX500_PINS(mop500_pins_sensors1p_old, ); static struct ux500_pin_lookup mop500_runtime_pins[] = { - PIN_LOOKUP("mcde-dpi", &mop500_pins_mcde_dpi), PIN_LOOKUP("mcde-tvout", &mop500_pins_mcde_tvout), PIN_LOOKUP("av8100-hdmi", &mop500_pins_mcde_hdmi), PIN_LOOKUP("nmk-i2c.0", &mop500_pins_i2c0), |