From e4af39eb90299e3d77cddfdcb9ad79beadc0c948 Mon Sep 17 00:00:00 2001 From: Jimmy Rubin Date: Fri, 30 Sep 2011 12:48:03 +0200 Subject: ux500: mcde: Remove sony display data from board Removes sony display driver specific data from board-xxx-mcde.c ST-Ericsson ID: 321190 ST-Ericsson Linux Next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jimmy Rubin Change-Id: Ice61906fb359edf5ebd665e066c4b537312cb94b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32718 Reviewed-by: Jimmy RUBIN Tested-by: Jimmy RUBIN Reviewed-by: QABUILD Reviewed-by: Marcus LORENTZON --- arch/arm/mach-ux500/board-mop500-mcde.c | 18 ---------------- arch/arm/mach-ux500/board-u5500-mcde.c | 32 ---------------------------- arch/arm/mach-ux500/board-u5500-regulators.c | 2 -- 3 files changed, 52 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index a1055854d47..ae043b1d21b 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -123,28 +123,12 @@ static struct mcde_display_device samsung_s6d16d0_display0 = { #ifdef CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY static struct mcde_port sony_port0 = { - .type = MCDE_PORTTYPE_DSI, - .mode = MCDE_PORTMODE_CMD, - .pixel_format = MCDE_PORTPIXFMT_DSI_24BPP, - .ifc = 1, .link = 0, - .sync_src = MCDE_SYNCSRC_BTA, - .update_auto_trig = false, - .phy = { - .dsi = { - .virt_id = 0, - .num_data_lanes = 2, - .ui = DSI_UNIT_INTERVAL_0, - .clk_cont = false, - .data_lanes_swap = false, - }, - }, }; struct mcde_display_sony_acx424akp_platform_data sony_acx424akp_display0_pdata = { .reset_gpio = HREFV60_DISP2_RST_GPIO, - .regulator_id = "vddi", }; static struct mcde_display_device sony_acx424akp_display0 = { @@ -158,8 +142,6 @@ static struct mcde_display_device sony_acx424akp_display0 = { */ .fifo = MCDE_FIFO_A, .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, - .native_x_res = 480, - .native_y_res = 854, .synchronized_update = true, .rotbuf1 = U8500_ESRAM_BASE + 0x20000 * 4, .rotbuf2 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x10000, diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 859a316cd45..6dc8ef73f3c 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -142,42 +142,12 @@ struct mcde_display_device generic_display0 = { #endif /* CONFIG_DISPLAY_GENERIC_DSI_PRIMARY */ static struct mcde_port port1 = { - .type = MCDE_PORTTYPE_DSI, - .mode = MCDE_PORTMODE_CMD, - .pixel_format = MCDE_PORTPIXFMT_DSI_24BPP, - .ifc = DSI_VIDEO_MODE, .link = 0, -#if defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) && \ - defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_AUTO_SYNC) - .sync_src = MCDE_SYNCSRC_OFF, - .update_auto_trig = true, -#else - .sync_src = MCDE_SYNCSRC_BTA, - .update_auto_trig = false, -#endif - .phy = { - .dsi = { - .virt_id = 0, - .num_data_lanes = 2, - .ui = DSI_UNIT_INTERVAL_0, - .clk_cont = false, - .data_lanes_swap = false, - }, - }, }; struct mcde_display_sony_acx424akp_platform_data \ sony_acx424akp_display0_pdata = { .reset_gpio = 226, - .reset_high = true, - .reset_delay = 11, - .reset_low_delay = 1, - .sleep_out_delay = 140, -#ifdef CONFIG_REGULATOR - .regulator_id = "vddi", - .min_supply_voltage = 2800000, /* 2.8V */ - .max_supply_voltage = 2800000 /* 2.8V */ -#endif }; struct mcde_display_device sony_acx424akp_display0 = { @@ -191,8 +161,6 @@ struct mcde_display_device sony_acx424akp_display0 = { #else .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, #endif - .native_x_res = 480, - .native_y_res = 854, #ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC .synchronized_update = true, #else diff --git a/arch/arm/mach-ux500/board-u5500-regulators.c b/arch/arm/mach-ux500/board-u5500-regulators.c index dcb48012753..66e8f3593d5 100644 --- a/arch/arm/mach-ux500/board-u5500-regulators.c +++ b/arch/arm/mach-ux500/board-u5500-regulators.c @@ -23,8 +23,6 @@ static struct regulator_consumer_supply ab5500_ldo_g_consumers[] = { }; static struct regulator_consumer_supply ab5500_ldo_h_consumers[] = { - /* Remove once sony display driver is updated */ - REGULATOR_SUPPLY("vddi", NULL), REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"), REGULATOR_SUPPLY("vdd", "1-004b"), /* Synaptics */ REGULATOR_SUPPLY("vin", "2-0036"), /* LM3530 */ -- cgit v1.2.3