lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Andrzej Zaborowski
2006-12-06 17:13:48 -08:00
committed by Tony Lindgren
parent 562aa1d4c6
commit ef557d76df
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-omap1/clock.c
View File

@@ -496,7 +496,7 @@ static int omap1_clk_enable_generic(struct clk *clk)
} }
} }
return 0; return;
} }
static void omap1_clk_disable_generic(struct clk *clk) static void omap1_clk_disable_generic(struct clk *clk)
@@ -654,7 +654,8 @@ int __init omap1_clk_init(void)
/* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */ /* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
reg = omap_readw(SOFT_REQ_REG) & (1 << 4); reg = omap_readw(SOFT_REQ_REG) & (1 << 4);
omap_writew(reg, SOFT_REQ_REG); 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); clk_init(&omap1_clk_functions);

2
arch/arm/mach-omap1/irq.c
View File

@@ -238,7 +238,7 @@ void __init omap_init_irq(void)
if (cpu_is_omap730()) if (cpu_is_omap730())
omap_unmask_irq(INT_730_IH2_IRQ); omap_unmask_irq(INT_730_IH2_IRQ);
else if (cpu_is_omap1510()) else if (cpu_is_omap15xx())
omap_unmask_irq(INT_1510_IH2_IRQ); omap_unmask_irq(INT_1510_IH2_IRQ);
else if (cpu_is_omap16xx()) else if (cpu_is_omap16xx())
omap_unmask_irq(INT_1610_IH2_IRQ); omap_unmask_irq(INT_1610_IH2_IRQ);

6
arch/arm/mach-omap1/pm.c
View File

@@ -256,7 +256,8 @@ void omap_pm_suspend(void)
tps65010_set_led(LED1, OFF); 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) * Step 1: turn off interrupts (FIXME: NOTE: already disabled)
@@ -434,7 +435,8 @@ void omap_pm_suspend(void)
MPUI1610_RESTORE(OMAP_IH2_3_MIR); 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 * Reenable interrupts