diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-power.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.h | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c index 5c1bb8d04350..6e2fd5dd4051 100644 --- a/arch/arm/mach-tegra/board-enterprise-power.c +++ b/arch/arm/mach-tegra/board-enterprise-power.c @@ -460,7 +460,6 @@ 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 */ @@ -468,11 +467,8 @@ 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)) { + /* Disable battery charging if power adapter is connected. */ + if (get_power_supply_type() == power_supply_adapter) { bcharger_pdata.num_consumer_supplies = 0; bcharger_pdata.consumer_supplies = NULL; } diff --git a/arch/arm/mach-tegra/board-enterprise.h b/arch/arm/mach-tegra/board-enterprise.h index c1044e6a4451..7a92e8cd4351 100644 --- a/arch/arm/mach-tegra/board-enterprise.h +++ b/arch/arm/mach-tegra/board-enterprise.h @@ -78,5 +78,4 @@ int enterprise_edp_init(void); #define BOARD_1205 (0x0C05) #define BOARD_E1197 (0x0B61) #define ENTERPRISE_FAB_A01 (0x01) -#define SKU_BATTERY_SUPPORT (1 << 8) #endif |