diff options
author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-18 15:35:04 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:00:17 +0100 |
commit | ff107ec2ee097e324f2e19b2c87f99eb7172fc29 (patch) | |
tree | 5c2b9cb7e05863fe277d45adfbb21fc80a5b1f5d | |
parent | 4b732bd3400097da3f90e6b910c7d7d5a901ab2b (diff) |
ux500: mcde: Remove DSI generic device
Remove DSI generic device from u5500 board
since it's no longer used/supported in that config.
ST-Ericsson ID: 368802
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: I7b2ef387e1a4333a06d99b9c90cd6c4ad884bd1c
Signed-off-by: Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34407
Reviewed-by: QATOOLS
-rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 104 |
1 files changed, 3 insertions, 101 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index a250ba4b110..de1b598ec01 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -24,8 +24,7 @@ #define DSI_UNIT_INTERVAL_2 0x5 enum { -#if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY) || \ - defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) +#ifdef CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY PRIMARY_DISPLAY_ID, #endif #ifdef CONFIG_DISPLAY_AV8100_TERTIARY @@ -77,63 +76,7 @@ static struct mcde_col_transform rgb_2_yCbCr_transform = { }; #endif -#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY -static struct mcde_port port0 = { - .type = MCDE_PORTTYPE_DSI, - .mode = MCDE_PORTMODE_CMD, - .pixel_format = MCDE_PORTPIXFMT_DSI_24BPP, - .ifc = DSI_VIDEO_MODE, - .link = 0, - .sync_src = MCDE_SYNCSRC_BTA, - .phy = { - .dsi = { - .virt_id = 0, - .num_data_lanes = 2, - .ui = DSI_UNIT_INTERVAL_0, - .clk_cont = false, - .data_lanes_swap = false, - }, - }, -}; - -struct mcde_display_generic_platform_data generic_display0_pdata = { - .reset_gpio = 226, - .reset_delay = 10, - .sleep_out_delay = 140, -#ifdef CONFIG_REGULATOR - .regulator_id = "v-display", - .min_supply_voltage = 2500000, /* 2.5V */ - .max_supply_voltage = 2700000 /* 2.7V */ -#endif -}; - -struct mcde_display_device generic_display0 = { - .name = "mcde_disp_generic", - .id = PRIMARY_DISPLAY_ID, - .port = &port0, - .chnl_id = MCDE_CHNL_A, - .fifo = MCDE_FIFO_A, -#ifdef CONFIG_MCDE_DISPLAY_PRIMARY_16BPP - .default_pixel_format = MCDE_OVLYPIXFMT_RGB565, -#else - .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, -#endif - .native_x_res = 864, - .native_y_res = 480, -#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC - .synchronized_update = true, -#else - .synchronized_update = false, -#endif - /* TODO: Remove rotation buffers once ESRAM driver is completed */ - .rotbuf1 = U5500_ESRAM_BASE + 0x20000 * 2, - .rotbuf2 = U5500_ESRAM_BASE + 0x20000 * 2 + 0x10000, - .dev = { - .platform_data = &generic_display0_pdata, - }, -}; -#endif /* CONFIG_DISPLAY_GENERIC_DSI_PRIMARY */ - +#ifdef CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY static struct mcde_port port1 = { .link = 0, }; @@ -166,6 +109,7 @@ struct mcde_display_device sony_acx424akp_display0 = { .platform_data = &sony_acx424akp_display0_pdata, }, }; +#endif /* CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY */ #ifdef CONFIG_DISPLAY_AV8100_TERTIARY static struct mcde_port port2 = { @@ -237,15 +181,11 @@ static int display_postregistered_callback(struct notifier_block *nb, u16 width, height; u16 virtual_width, virtual_height; u32 rotate = FB_ROTATE_UR; - u32 rotate_angle = 0; struct fb_info *fbi; #ifdef CONFIG_DISPDEV struct mcde_fb *mfb; #endif - struct mcde_display_sony_acx424akp_platform_data *pdata = - ddev->dev.platform_data; - if (event != MCDE_DSS_EVENT_DISPLAY_REGISTERED) return 0; @@ -254,33 +194,6 @@ static int display_postregistered_callback(struct notifier_block *nb, mcde_dss_get_native_resolution(ddev, &width, &height); - if (pdata->disp_panel == DISPLAY_SONY_ACX424AKP) - rotate_angle = 0; - else - rotate_angle = \ - CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE; - -#if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY) || \ - defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) - if (ddev->id == PRIMARY_DISPLAY_ID) { - switch (rotate_angle) { - case 0: - rotate = FB_ROTATE_UR; - break; - case 90: - rotate = FB_ROTATE_CW; - swap(width, height); - break; - case 180: - rotate = FB_ROTATE_UD; - break; - case 270: - rotate = FB_ROTATE_CCW; - swap(width, height); - break; - } - } -#endif virtual_width = width; virtual_height = height * 2; @@ -349,17 +262,6 @@ int __init init_u5500_display_devices(void) if (ret) pr_warning("Failed to register dss notifier\n"); -#ifdef CONFIG_DISPLAY_GENERIC_PRIMARY - if (cpu_is_u5500v1()) { - if (display_initialized_during_boot) - generic_display0.power_mode = MCDE_DISPLAY_PM_STANDBY; - ret = mcde_display_device_register(&generic_display0); - if (ret) - pr_warning("Failed to register generic \ - display device 0\n"); - } -#endif - #ifdef CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY if (cpu_is_u5500v2()) { if (display_initialized_during_boot) |