[PATCH] ARM: OMAP: correct misc 15xx and non-15xx platform code

[PATCH] ARM: OMAP: correct misc 15xx and non-15xx platform code

[andrzej zaborowski]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Disable accesses to SOFT_REQ_REG2 and ULPD_SOFT_DISABLE_REQ_REG
registers for 15xx processors that don't have these registers. Enable
level 2 interrupt handler for processors that identify as OMAP 15xx
(e.g 310) and not 1510 specifically. Also fix the following compiler
warning (only visible with CONFIG_OMAP_RESET_CLOCKS):

arch/arm/mach-omap1/clock.c: In function 'omap1_clk_disable_unused':
arch/arm/mach-omap1/clock.c:634: warning: 'return' with a value, in
function returning void

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

[-- Attachment #2: linux-310-irqs.patch --]
[-- Type: application/octet-stream, Size: 1734 bytes --]

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 7a25e8d..e9aabcf 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -631,7 +631,7 @@ static void __init omap1_clk_disable_unu
 	clk->disable(clk);
 	printk(" done\n");
 
-	return 0;
+	return;
 }
 
 #else
@@ -656,7 +656,8 @@ int __init omap1_clk_init(void)
 	/* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
 	reg = omap_readw(SOFT_REQ_REG) & (1 << 4);
 	omap_writew(reg, SOFT_REQ_REG);
-	omap_writew(0, SOFT_REQ_REG2);
+	if (!cpu_is_omap15xx())
+		omap_writew(0, SOFT_REQ_REG2);
 
 	clk_init(&omap1_clk_functions);
 
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 3ea140b..4854852 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -238,7 +238,7 @@ #endif
 
 	if (cpu_is_omap730())
 		omap_unmask_irq(INT_730_IH2_IRQ);
-	else if (cpu_is_omap1510())
+	else if (cpu_is_omap15xx())
 		omap_unmask_irq(INT_1510_IH2_IRQ);
 	else if (cpu_is_omap16xx())
 		omap_unmask_irq(INT_1610_IH2_IRQ);
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index cd76185..be213a0 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -256,7 +256,8 @@ void omap_pm_suspend(void)
 		tps65010_set_led(LED1, OFF);
 	}
 
-	omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
+	if (!cpu_is_omap15xx())
+		omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
 	/*
 	 * Step 1: turn off interrupts (FIXME: NOTE: already disabled)
@@ -434,7 +437,8 @@ void omap_pm_suspend(void)
 		MPUI1610_RESTORE(OMAP_IH2_3_MIR);
 	}
 
-	omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
+	if (!cpu_is_omap15xx())
+		omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
 
 	/*
 	 * Reenable interrupts

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ARM: OMAP: correct misc 15xx and non-15xx platform code

[Tony Lindgren]

* andrzej zaborowski <balrog@zabor.org> [060922 23:02]:
> Disable accesses to SOFT_REQ_REG2 and ULPD_SOFT_DISABLE_REQ_REG
> registers for 15xx processors that don't have these registers. Enable
> level 2 interrupt handler for processors that identify as OMAP 15xx
> (e.g 310) and not 1510 specifically. Also fix the following compiler
> warning (only visible with CONFIG_OMAP_RESET_CLOCKS):
> 
> arch/arm/mach-omap1/clock.c: In function 'omap1_clk_disable_unused':
> arch/arm/mach-omap1/clock.c:634: warning: 'return' with a value, in
> function returning void
> 
> Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

Pushing today.

Tony