summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-enterprise-power.c
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2011-11-24 19:27:07 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-08 16:53:45 +0530
commit4942a88f7af0dedc357267f3ce7e50291dc1ad7c (patch)
tree1e679d72145f0c414c465109f40a3d31918beefe /arch/arm/mach-tegra/board-enterprise-power.c
parentd454cee86edac49aca7bdc1d2357e69adfe829ee (diff)
arm: tegra: enterprise: Provide clock info through clock init
Providing the clock configuration through clock init structure. Reviewed-on: http://git-master/r/67075 (cherry picked from commit 18f4f66a1f623a8f4b1d05283232a7f98d89ace9) Change-Id: I74287209505a0bf182594ea7b4ec147997c699fc Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/67335
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-power.c')
-rw-r--r--arch/arm/mach-tegra/board-enterprise-power.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c
index 0e6a1604bb59..58f7b7014221 100644
--- a/arch/arm/mach-tegra/board-enterprise-power.c
+++ b/arch/arm/mach-tegra/board-enterprise-power.c
@@ -180,7 +180,7 @@ static struct regulator_consumer_supply tps80031_battery_charge_supply[] = {
.init_enable = _init_enable, \
.init_apply = _init_apply, \
.flags = _flags, \
- .ext_pwr_ctrl = _ectrl, \
+ .ext_ctrl_flag = _ectrl, \
.delay_us = _delay, \
}
@@ -294,16 +294,24 @@ static struct tps80031_subdev_info tps80031_devs[] = {
TPS_GPADC(),
};
-struct tps80031_32kclock_plat_data clk32k_pdata = {
- .en_clk32kg = 1,
- .en_clk32kaudio = 1,
+struct tps80031_clk32k_init_data clk32k_idata[] = {
+ {
+ .clk32k_nr = TPS80031_CLOCK32K_G,
+ .enable = true,
+ },
+ {
+ .clk32k_nr = TPS80031_CLOCK32K_AUDIO,
+ .enable = true,
+ },
};
+
static struct tps80031_platform_data tps_platform = {
.num_subdevs = ARRAY_SIZE(tps80031_devs),
.subdevs = tps80031_devs,
.irq_base = ENT_TPS80031_IRQ_BASE,
.gpio_base = ENT_TPS80031_GPIO_BASE,
- .clk32k_pdata = &clk32k_pdata,
+ .clk32k_init_data = clk32k_idata,
+ .clk32k_init_data_size = ARRAY_SIZE(clk32k_idata),
};
static struct i2c_board_info __initdata enterprise_regulators[] = {