summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2008-05-29 11:40:21 -0400
committerJustin Waters <justin.waters@timesys.com>2008-05-29 11:40:21 -0400
commit6e6cc5e0205c1a939405c4ab296b85e7c48aa6c5 (patch)
tree2e4b76d8bb443b2ce6031c51dfc647cc90487dea
parent282585cfd7074f9d53b1630f9fdee3c9c6abfa95 (diff)
MX27Lite: Change PMIC PRIINT pin to USBH1_SUSP
The PMIC uses a different GPIO pin on the Litekit than it did on the ADS. This changes the pin to the proper value. Signed-off-by: Justin Waters <justin.waters@timesys.com>
-rw-r--r--arch/arm/mach-mx27/board-mx27lite.h2
-rw-r--r--arch/arm/mach-mx27/mx27lite.c2
-rw-r--r--arch/arm/mach-mx27/mx27lite_gpio.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx27/board-mx27lite.h b/arch/arm/mach-mx27/board-mx27lite.h
index eef4af87f440..95e211c352a5 100644
--- a/arch/arm/mach-mx27/board-mx27lite.h
+++ b/arch/arm/mach-mx27/board-mx27lite.h
@@ -93,6 +93,6 @@ enum mxc_card_no {
/*
* MXC PMIC/Atlas Chip Configuration
*/
-#define MXC_PMIC_INT_LINE IOMUX_TO_IRQ(MX27_PIN_TOUT)
+#define MXC_PMIC_INT_LINE IOMUX_TO_IRQ(MX27_PIN_SD1_D1)
#endif /* __BOARD_MX27LITE_H__ */
diff --git a/arch/arm/mach-mx27/mx27lite.c b/arch/arm/mach-mx27/mx27lite.c
index 3bafb14fbe9e..9200116efc6a 100644
--- a/arch/arm/mach-mx27/mx27lite.c
+++ b/arch/arm/mach-mx27/mx27lite.c
@@ -223,7 +223,7 @@ static void __init mxc_init_fb(void)
static struct spi_board_info mxc_spi_board_info[] __initdata = {
{
.modalias = "pmic_spi",
- .irq = IOMUX_TO_IRQ(MX27_PIN_TOUT),
+ .irq = MXC_PMIC_INT_LINE,
.max_speed_hz = 4000000,
.bus_num = 1,
.chip_select = 0,
diff --git a/arch/arm/mach-mx27/mx27lite_gpio.c b/arch/arm/mach-mx27/mx27lite_gpio.c
index 15f96589f1fe..f5bf68657190 100644
--- a/arch/arm/mach-mx27/mx27lite_gpio.c
+++ b/arch/arm/mach-mx27/mx27lite_gpio.c
@@ -692,8 +692,8 @@ void gpio_fs453_reset_high(void)
*/
void gpio_pmic_active(void)
{
- gpio_config_mux(MX27_PIN_TOUT, GPIO_MUX_GPIO);
- mxc_set_gpio_direction(MX27_PIN_TOUT, 1);
+ gpio_config_mux(MX27_PIN_SD1_D1, GPIO_MUX_GPIO);
+ mxc_set_gpio_direction(MX27_PIN_SD1_D1, 1);
}