diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-11 09:09:27 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:13 +0200 |
| commit | 6d4c60e9470b03d9ae737c35e6732275a2cd5bfd (patch) | |
| tree | dc3ce196c10f72767450a6d63d0dee7e5f4a82f8 /arch/arm/mach-ux500/board-mop500-regulators.c | |
| parent | 5626e5cbf17b1030a1aba01b88bd43ff00739dc2 (diff) | |
mach-ux500: framebuffer: Changes to be able to compile with u5500 and u8500 both enable
Move mcde fb common part in devices-common.c
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index e60ff538e83..343a0826d6c 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -20,12 +20,6 @@ #define REGULATOR_SUPPLY_DEBUG(_name, _dev_name) #endif -#define REGULATOR_SUPPLY_DEV(_name, _dev) \ -{ \ - .supply = _name, \ - .dev = _dev, \ -} - /* * TPS61052 regulator */ @@ -78,10 +72,10 @@ static struct regulator_consumer_supply ab8500_vaux2_consumers[] = { REGULATOR_SUPPLY("vcc-avswitch", "ab8500-codec.0"), REGULATOR_SUPPLY("vcc-avswitch", "ab8500-acc-det.0"), #ifdef CONFIG_DISPLAY_AB8500_TERTIARY - REGULATOR_SUPPLY_DEV("v-ab8500-AV-switch", &tvout_ab8500_display.dev), + REGULATOR_SUPPLY("v-ab8500-AV-switch", "mcde_tv_ab8500.2"), #endif #ifdef CONFIG_DISPLAY_AV8100_TERTIARY - REGULATOR_SUPPLY_DEV("v-av8100-AV-switch", &av8100_hdmi.dev), + REGULATOR_SUPPLY("v-av8100-AV-switch", "av8100_hdmi.2"), #endif REGULATOR_SUPPLY_DEBUG("aux2", "reg-virt-consumer.1") }; @@ -107,7 +101,7 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = { REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"), REGULATOR_SUPPLY("vddadc", "ab8500-charger.0"), #ifdef CONFIG_DISPLAY_AB8500_TERTIARY - REGULATOR_SUPPLY_DEV("vtvout", &tvout_ab8500_display.dev), + REGULATOR_SUPPLY("v-tvout", "mcde_tv_ab8500.2"), #endif REGULATOR_SUPPLY_DEBUG("tvout", "reg-virt-consumer.4") }; |