summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-01-12 15:30:20 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:35 +0200
commit58dd0dcace46fb5e27c635703fe13e74e0b71026 (patch)
tree2e21a54f92977f9d49a50c607f1445a76683e5f5
parent7f9ca5c68ba946416b92e726d6974c59cb2b516d (diff)
mach-ux500: U9500: Add wake-up support for ST-E HSI
Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c2
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c16
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index c6d10fb6167..9b2b82845c8 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -182,7 +182,7 @@ static pin_cfg_t u9500_pins[] = {
GPIO222_HSIT_FLA0 | PIN_OUTPUT_LOW,
GPIO223_HSIT_DAT0 | PIN_OUTPUT_LOW,
GPIO224_HSIT_RDY0 | PIN_INPUT_PULLDOWN,
- GPIO225_GPIO | PIN_INPUT_PULLDOWN, /* CA_WAKE0 */
+ GPIO225_HSIT_CAWAKE0 | PIN_INPUT_PULLDOWN, /* CA_WAKE0 */
GPIO226_GPIO | PIN_OUTPUT_HIGH, /* AC_WAKE0 */
};
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index f4c1b2d6efc..0069cde7050 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -285,6 +285,20 @@ struct platform_device u8500_wdt_device = {
/*
* HSI
*/
+#define HSI0_CAWAKE { \
+ .start = IRQ_PRCMU_HSI0, \
+ .end = IRQ_PRCMU_HSI0, \
+ .flags = IORESOURCE_IRQ, \
+ .name = "hsi0_cawake" \
+}
+
+#define HSI0_ACWAKE { \
+ .start = 226, \
+ .end = 226, \
+ .flags = IORESOURCE_IO, \
+ .name = "hsi0_acwake" \
+}
+
#define HSIR_OVERRUN(num) { \
.start = IRQ_DB8500_HSIR_CH##num##_OVRRUN, \
.end = IRQ_DB8500_HSIR_CH##num##_OVRRUN, \
@@ -357,6 +371,8 @@ static struct resource u8500_hsi_resources[] = {
HSIR_OVERRUN(5),
HSIR_OVERRUN(6),
HSIR_OVERRUN(7),
+ HSI0_CAWAKE,
+ HSI0_ACWAKE,
};
#ifdef CONFIG_STE_DMA40