diff options
| author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-18 15:18:01 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:16 +0200 |
| commit | a10fd75c69cf4089b2aa5e24061d5216d15db728 (patch) | |
| tree | c85311c8be3df4925be5878d4c5c1d5ef22619ab | |
| parent | 471d0b85a246d6d4a55122f527c5359ef9bd7294 (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
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig-arch | 7 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 74 |
2 files changed, 0 insertions, 81 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 d8d8a647974..45a0002ee6d 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, |