diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-01-31 16:03:51 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-14 10:05:08 -0800 |
| commit | a02a0ae41c4de12a250a632878687b04b0f80dcc (patch) | |
| tree | 1ed24e6a7c54b7bb9ff4539ee279fe3b62ce10b1 /arch/arm/mach-tegra/board-cardhu-power.c | |
| parent | 7bcee3ebe5767bc14adb554be1d3602461c3963f (diff) | |
arm: tegra: cardhu: use tps62360 regulator driver
Use the mainline's regulator driver tps62360 for core power
in place of NV's tps6236x driver.
Change-Id: Ibfa0ef8f4d59f48b31867dc1b1b0635d39a738ef
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/78413
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index 97b168ed8166..83f9483b54a6 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -29,7 +29,7 @@ #include <linux/regulator/gpio-switch-regulator.h> #include <linux/regulator/fixed.h> #include <linux/regulator/tps6591x-regulator.h> -#include <linux/regulator/tps6236x-regulator.h> +#include <linux/regulator/tps62360.h> #include <linux/power/gpio-charger.h> #include <asm/mach-types.h> @@ -339,11 +339,11 @@ static struct i2c_board_info __initdata cardhu_regulators[] = { }; /* TPS62361B DC-DC converter */ -static struct regulator_consumer_supply tps6236x_dcdc_supply[] = { +static struct regulator_consumer_supply tps62361_dcdc_supply[] = { REGULATOR_SUPPLY("vdd_core", NULL), }; -static struct tps6236x_regulator_platform_data tps6236x_pdata = { +static struct tps62360_regulator_platform_data tps62361_pdata = { .reg_init_data = { \ .constraints = { \ .min_uV = 500000, \ @@ -357,20 +357,20 @@ static struct tps6236x_regulator_platform_data tps6236x_pdata = { .boot_on = 1, \ .apply_uV = 0, \ }, \ - .num_consumer_supplies = ARRAY_SIZE(tps6236x_dcdc_supply), \ - .consumer_supplies = tps6236x_dcdc_supply, \ - }, \ - .internal_pd_enable = 0, \ - .enable_discharge = true, \ - .vsel = 3, \ - .init_uV = -1, \ - .init_apply = 0, \ + .num_consumer_supplies = ARRAY_SIZE(tps62361_dcdc_supply), \ + .consumer_supplies = tps62361_dcdc_supply, \ + }, \ + .en_discharge = true, \ + .vsel0_gpio = -1, \ + .vsel1_gpio = -1, \ + .vsel0_def_state = 1, \ + .vsel1_def_state = 1, \ }; -static struct i2c_board_info __initdata tps6236x_boardinfo[] = { +static struct i2c_board_info __initdata tps62361_boardinfo[] = { { - I2C_BOARD_INFO("tps62361B", 0x60), - .platform_data = &tps6236x_pdata, + I2C_BOARD_INFO("tps62361", 0x60), + .platform_data = &tps62361_pdata, }, }; @@ -444,8 +444,8 @@ int __init cardhu_regulator_init(void) /* Resgister the TPS6236x for all boards whose sku bit 0 is set. */ if ((board_info.sku & SKU_DCDC_TPS62361_SUPPORT) || (pmu_board_info.sku & SKU_DCDC_TPS62361_SUPPORT)) { - pr_info("Registering the device TPS62361B\n"); - i2c_register_board_info(4, tps6236x_boardinfo, 1); + pr_info("Registering the device TPS62361\n"); + i2c_register_board_info(4, tps62361_boardinfo, 1); } is_cardhu_machine = true; return 0; |