diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-08-26 14:33:42 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-26 15:21:37 -0700 |
| commit | 407a3631a15f22735a9301ebf9dd85920814dce8 (patch) | |
| tree | 2c4949947e4e6f213a46110269c606eb09c53018 | |
| parent | f7ad18a49224b897df1d1d92af50d46dab18a24b (diff) | |
arm: tegra: entrprise: Enable battery charging for special SKU
Enable battery charging with special SKU.
The board ID have the sku field and bit 0 of the sku
should be 1 for enabling battery charging.
bug 868483
Change-Id: I028bcbfbc042184a7feecb66bfbf35d6c70cd355
Reviewed-on: http://git-master/r/49416
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-power.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c index 7c2523a1ac68..5c1bb8d04350 100644 --- a/arch/arm/mach-tegra/board-enterprise-power.c +++ b/arch/arm/mach-tegra/board-enterprise-power.c @@ -460,6 +460,7 @@ int __init enterprise_regulator_init(void) { void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); u32 pmc_ctrl; + struct board_info board_info; /* configure the power management controller to trigger PMU * interrupts when low */ @@ -467,6 +468,15 @@ int __init enterprise_regulator_init(void) pmc_ctrl = readl(pmc + PMC_CTRL); writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); + tegra_get_board_info(&board_info); + + /* Disable battery charging for board whose sku does not + have battery support */ + if (!(board_info.sku & SKU_BATTERY_SUPPORT)) { + bcharger_pdata.num_consumer_supplies = 0; + bcharger_pdata.consumer_supplies = NULL; + } + i2c_register_board_info(4, enterprise_regulators, 1); enterprise_gpio_switch_regulator_init(); pm_power_off = enterprise_power_off; diff --git a/arch/arm/mach-tegra/board-enterprise.h b/arch/arm/mach-tegra/board-enterprise.h index 19de3f999388..700ba9fde0a4 100644 --- a/arch/arm/mach-tegra/board-enterprise.h +++ b/arch/arm/mach-tegra/board-enterprise.h @@ -76,5 +76,7 @@ int enterprise_edp_init(void); #define CAM_FLASH_MAX_FLASH_AMP 7 #define BOARD_1205 (0x0C05) +#define BOARD_E1197 (0x0B61) #define ENTERPRISE_FAB_A01 (0x01) +#define SKU_BATTERY_SUPPORT 0x1 #endif |