diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-04 23:52:28 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-04 23:52:28 +0400 |
| commit | c96bfaffb783b86555e13d97e871c2adeb97d613 (patch) | |
| tree | 045ee1e0735c58d192102e03184607d76ef3bf26 /arch | |
| parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
| parent | 9e9bc235580829e3a06ccd13aa10110478c2e093 (diff) | |
| download | linux-c96bfaffb783b86555e13d97e871c2adeb97d613.tar.xz | |
Merge tag 'davinci-for-v3.18/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical
Merge "DaVinci board file fixes for v3.18" from Sekhar Nori:
Some non-critcal fixes for DA850 EVM board file
adding missing regulator information.
* tag 'davinci-for-v3.18/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: board-da850-evm: Add needed regulators for tlv320aic3106 codec
ARM: davinci: board-da850-evm: Mark dcdc2 of TPS65070 as always_on
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 234c5bb091f5..fa11415e906a 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -35,6 +35,7 @@ #include <linux/platform_data/uio_pruss.h> #include <linux/regulator/machine.h> #include <linux/regulator/tps6507x.h> +#include <linux/regulator/fixed.h> #include <linux/spi/spi.h> #include <linux/spi/flash.h> #include <linux/wl12xx.h> @@ -842,6 +843,16 @@ static int da850_lcd_hw_init(void) return 0; } +/* Fixed regulator support */ +static struct regulator_consumer_supply fixed_supplies[] = { + /* Baseboard 3.3V: 5V -> TPS73701DCQ -> 3.3V */ + REGULATOR_SUPPLY("AVDD", "1-0018"), + REGULATOR_SUPPLY("DRVDD", "1-0018"), + + /* Baseboard 1.8V: 5V -> TPS73701DCQ -> 1.8V */ + REGULATOR_SUPPLY("DVDD", "1-0018"), +}; + /* TPS65070 voltage regulator support */ /* 3.3V */ @@ -865,6 +876,7 @@ static struct regulator_consumer_supply tps65070_dcdc2_consumers[] = { { .supply = "dvdd3318_c", }, + REGULATOR_SUPPLY("IOVDD", "1-0018"), }; /* 1.2V */ @@ -936,6 +948,7 @@ static struct regulator_init_data tps65070_regulator_data[] = { .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_STATUS), .boot_on = 1, + .always_on = 1, }, .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc2_consumers), .consumer_supplies = tps65070_dcdc2_consumers, @@ -1446,6 +1459,8 @@ static __init void da850_evm_init(void) if (ret) pr_warn("%s: GPIO init failed: %d\n", __func__, ret); + regulator_register_fixed(0, fixed_supplies, ARRAY_SIZE(fixed_supplies)); + ret = pmic_tps65070_init(); if (ret) pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret); |