From 1453f8259ef4100ca689884d5d754761cc10a64f Mon Sep 17 00:00:00 2001 From: Jimmy Rubin Date: Thu, 27 May 2010 15:25:41 +0200 Subject: MCDE: Adding new MCDE display, AB8500 Denc and AV8100 driver This patch does the following: * Removes display support on ED! * Removes the old MCDE display driver and adds the new MCDE drivers to drivers/video/mcde. * Removes the old AV8100 driver and adds the new AV8100 drivers to drivers/video/av8100. * Moves the mcde and av8100 specific header files from machine to include/video. * Adds AB8500 Denc driver to drivers/misc/ab8500_denc. * Power management support added to the MCDE display driver. * Removes old MCDE specific configurations. * Adds new menuconfig selection SystemType/Display Selection where it is possbile to choose display types. * Updated standard configurations (mop500_defconfig, mop500_power_defconfig and mop500_USB_HOST_defconfig). * Landscape mode removed from menuconfig for main display. ST Ericsson Change-ID: WP259355 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/369 Reviewed-by: Dan JOHANSSON Tested-by: Dan JOHANSSON Signed-off-by: Mian Yousaf Kaukab Change-Id: I0c5e5c0f80fde304d8b96e3faee0e8b1819d1ae7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2378 Reviewed-by: Jonas ABERG --- arch/arm/mach-ux500/mop500-regulators.c | 46 +++------------------------------ 1 file changed, 3 insertions(+), 43 deletions(-) (limited to 'arch/arm/mach-ux500/mop500-regulators.c') diff --git a/arch/arm/mach-ux500/mop500-regulators.c b/arch/arm/mach-ux500/mop500-regulators.c index 4b1cea6a14c..977d54b67e6 100644 --- a/arch/arm/mach-ux500/mop500-regulators.c +++ b/arch/arm/mach-ux500/mop500-regulators.c @@ -59,30 +59,10 @@ static struct platform_device db8500_vape_regulator_dev = { #define U8500_VANA_REGULATOR_MAX_VOLTAGE (1200000) static struct regulator_consumer_supply db8500_vana_consumers[] = { -#ifdef CONFIG_FB_U8500_MCDE_CHANNELA { - .dev = &u8500_mcde0_device.dev, + .dev = &ux500_mcde_device.dev, .supply = "v-ana", }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELB - { - .dev = &u8500_mcde1_device.dev, - .supply = "v-ana", - }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELC0 - { - .dev = &u8500_mcde2_device.dev, - .supply = "v-ana", - }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELC1 - { - .dev = &u8500_mcde3_device.dev, - .supply = "v-ana", - }, -#endif }; static struct regulator_init_data db8500_vana_init = { @@ -117,30 +97,10 @@ extern struct platform_device sensors1p_device; #define AB8500_VAUXN_LDO_MAX_VOLTAGE (3300000) static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { -#ifdef CONFIG_FB_U8500_MCDE_CHANNELA - { - .dev = &u8500_mcde0_device.dev, - .supply = "v-mcde", - }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELB { - .dev = &u8500_mcde1_device.dev, - .supply = "v-mcde", + .dev = NULL, + .supply = "v-display", }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELC0 - { - .dev = &u8500_mcde2_device.dev, - .supply = "v-mcde", - }, -#endif -#ifdef CONFIG_FB_U8500_MCDE_CHANNELC1 - { - .dev = &u8500_mcde3_device.dev, - .supply = "v-mcde", - }, -#endif #ifdef CONFIG_SENSORS1P_MOP { .dev = &sensors1p_device.dev, -- cgit v1.2.3