Some non-critcal fixes for DA850 EVM board file

adding missing regulator information.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJUBDu4AAoJEGFBu2jqvgRNVgIP/3fCJd2/WYYbGn5GHlFBFYwi
 kMwAPTlfY0C2iSsWCnk5ED12LeeK/OFSgG6YIvjt8oH/tcpYpdAcEPVXFWGqD7ZE
 /QbZp4P0o7cWokOZdRAj++iv2XJ82F5Xxo0cEoIxNUJiPE7Lq/RVGa2Hrytis6Rj
 eixvqrfV66h3Z4fRSMLyliOQtY0v0CRS3DiigVzLCEtAbohpu022HxM4Pls2zMy9
 Wfv9/95HtKC9uDQHU8dFm4GkMVpMlNfU2AdnpqNyrRdihpADkmjjJqpm4YQi6cV3
 Le0LLybjRE7pdcxtCnz98HFPZHqyvz5xD9U1lv4KAM7ainy/IlilbX3iF58Ersdr
 wK5KyyBfWsIaUZcA6JbRiFd93VHayDwitR0Cs+UKwP7QKsBjg22nrRf7JVvt/iwl
 bkjhYihCgMgk/EGbXOJ7fd3ZSzPRB6KgQAkwWCFUVH9Zf7a1hY0UHptzC2UHNd2L
 3ZGUXZ/NzLByvDBf0PpSy3VTnIJ9gC666p1JMnDLfpDOk6pDrSLh4q7rWtmyTkh3
 y3a1nFjqDq450aWI2HBwb/RjAVlMmUPTzgi6NNhi6ejeFNWFFSbk+NR3Vgx8Y0cS
 ZAoOz7KOS3LBxinJ1QgurWpGyTF6B/TRz0fxw3FXfxnst7TkEBYD/rx3TqiOFptf
 EYrdgbcqXg8pA3TMpa9x
 =/1n0
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2014-09-04 21:52:28 +02:00
commit c96bfaffb7

View File

@ -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);