From 1b84387ac12b42b09315c6c1d176588de4b2e46f Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Sun, 13 Jun 2010 11:31:49 +0300 Subject: [ARM] pxa/cm-x300: enable the IRQ_WAKEUP0 as wakeup source. Signed-off-by: Igor Grinberg Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao --- arch/arm/mach-pxa/cm-x300.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-pxa/cm-x300.c') diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index fdda6be6c391..8d227b4e15f3 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -689,6 +689,7 @@ static void __init cm_x300_init_da9030(void) { pxa3xx_set_i2c_power_info(&cm_x300_pwr_i2c_info); i2c_register_board_info(1, &cm_x300_pmic_info, 1); + set_irq_wake(IRQ_WAKEUP0, 1); } static void __init cm_x300_init_wi2wi(void) -- cgit v1.2.3-59-g8ed1b From a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Tue, 20 Jul 2010 10:58:52 +0300 Subject: [ARM] pxa/cm-x300: fix ffuart registration ffuart is available on cm-x300 only with pxa300. Signed-off-by: Igor Grinberg Cc: stable Signed-off-by: Eric Miao --- arch/arm/mach-pxa/cm-x300.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/cm-x300.c') diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 8d227b4e15f3..c70e6c2f4e7c 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -746,9 +746,10 @@ static void __init cm_x300_init(void) { cm_x300_init_mfp(); - pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); + if (cpu_is_pxa300()) + pxa_set_ffuart_info(NULL); cm_x300_init_da9030(); cm_x300_init_dm9000(); -- cgit v1.2.3-59-g8ed1b