diff options
| author | Colin Cross <ccross@android.com> | 2011-05-12 14:35:54 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:49:11 -0700 |
| commit | d1cbfd1e453eeec3b4fcdcb6f466c01c7b546661 (patch) | |
| tree | dacff1386a7cd320bb9466090ce49c3297f5952d /arch/arm/mach-omap2/board-tuna-power.c | |
| parent | 96ab6569c38e78fc20db7daa8969941c62d64373 (diff) | |
| download | kernel_samsung_tuna-d1cbfd1e453eeec3b4fcdcb6f466c01c7b546661.zip kernel_samsung_tuna-d1cbfd1e453eeec3b4fcdcb6f466c01c7b546661.tar.gz kernel_samsung_tuna-d1cbfd1e453eeec3b4fcdcb6f466c01c7b546661.tar.bz2 | |
ARM: omap4: tuna: Move charger mux settings to power init
Change-Id: If7eaa78d4b41e70df4a9e6e3c8403af69d8e5a13
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-tuna-power.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-tuna-power.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-tuna-power.c b/arch/arm/mach-omap2/board-tuna-power.c index eb23a14..4497fba 100644 --- a/arch/arm/mach-omap2/board-tuna-power.c +++ b/arch/arm/mach-omap2/board-tuna-power.c @@ -22,9 +22,12 @@ #include <linux/pda_power.h> #include <linux/platform_device.h> -/* These will be different on lunchbox hardware */ -#define GPIO_CHARGING_N 11 -#define GPIO_TA_NCONNECTED 12 +#include "board-tuna.h" +#include "mux.h" + +/* These will be different on pre-lunchbox, lunchbox, and final */ +#define GPIO_CHARGING_N 159 +#define GPIO_TA_NCONNECTED 160 #define GPIO_CHARGE_N 13 static struct gpio charger_gpios[] = { @@ -100,6 +103,15 @@ void __init omap4_tuna_power_init(void) { struct platform_device *pdev; + if (omap4_tuna_get_revision() == TUNA_REV_PRE_LUNCHBOX) { + charger_gpios[0].gpio = 11; + charger_gpios[1].gpio = 12; + } + + omap_mux_init_gpio(charger_gpios[0].gpio, OMAP_PIN_INPUT); + omap_mux_init_gpio(charger_gpios[1].gpio, OMAP_PIN_INPUT); + omap_mux_init_gpio(charger_gpios[2].gpio, OMAP_PIN_OUTPUT); + pdev = platform_device_register_resndata(NULL, "pda-power", -1, charger_resources, ARRAY_SIZE(charger_resources), &charger_pdata, sizeof(charger_pdata)); |