From: Kevin Hilman <[email protected]> The PRCM base register is different on 242x and 243x. Use the #ifdef'd #define from omap24xx.h instead of the locally defined one. Signed-off-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> --- arch/arm/mach-omap2/pm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -45,7 +45,6 @@ #include <asm/arch/dma.h> #include <asm/arch/board.h> -#define PRCM_BASE 0x48008000 #define PRCM_REVISION 0x000 #define PRCM_SYSCONFIG 0x010 #define PRCM_IRQSTATUS_MPU 0x018 @@ -144,7 +143,7 @@ static void (*omap2_sram_idle)(void); static void (*omap2_sram_suspend)(int dllctrl); static void (*saved_idle)(void); -static u32 prcm_base = IO_ADDRESS(PRCM_BASE); +static u32 prcm_base = IO_ADDRESS(OMAP24XX_PRCM_BASE); static inline void prcm_write_reg(int idx, u32 val) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- References:
- [PATCH 0/18] ARM: OMAP: Updates for OMAP2 common code
- From: Tony Lindgren <[email protected]>
- [PATCH 1/18] ARM: OMAP2: Place SMS and SDRC into smart idle mode
- From: Tony Lindgren <[email protected]>
- [PATCH 2/18] ARM: OMAP2: Force APLLs always active
- From: Tony Lindgren <[email protected]>
- [PATCH 3/18] ARM: OMAP: Enable serial idling and wakeup features
- From: Tony Lindgren <[email protected]>
- [PATCH 4/18] ARM: OMAP: Optimize INTC register accesses and enable autoidling
- From: Tony Lindgren <[email protected]>
- [PATCH 5/18] ARM: OMAP: Board Apollon update, fix boot
- From: Tony Lindgren <[email protected]>
- [PATCH 6/18] ARM: OMAP: omap2/memory.c compile fixes
- From: Tony Lindgren <[email protected]>
- [PATCH 7/18] ARM: OMAP: 24xx pinmux updates
- From: Tony Lindgren <[email protected]>
- [PATCH 8/18] ARM: OMAP: omap2/gpmc updates
- From: Tony Lindgren <[email protected]>
- [PATCH 9/18] ARM: OMAP: abstract debug card setup (smc, leds)
- From: Tony Lindgren <[email protected]>
- [PATCH 10/18] ARM: OMAP: Add minimal OMAP2430 support
- From: Tony Lindgren <[email protected]>
- [PATCH 11/18] ARM: OMAP: Tabify mux.c
- From: Tony Lindgren <[email protected]>
- [PATCH 12/18] ARM: OMAP: TUSB EVM init
- From: Tony Lindgren <[email protected]>
- [PATCH 13/18] ARM: OMAP: Merge gpmc changes from N800 tree
- From: Tony Lindgren <[email protected]>
- [PATCH 14/18] ARM: OMAP: Merge driver headers from N800 tree
- From: Tony Lindgren <[email protected]>
- [PATCH 15/18] ARM: OMAP: Merge PM code from N800 tree
- From: Tony Lindgren <[email protected]>
- [PATCH 16/18] ARM: OMAP: 243x: Add mappings for SDRC and SMS
- From: Tony Lindgren <[email protected]>
- [PATCH 17/18] ARM: OMAP: Device init for OMAP24xx Enhanced Audio Controller
- From: Tony Lindgren <[email protected]>
- [PATCH 0/18] ARM: OMAP: Updates for OMAP2 common code
- Prev by Date: [PATCH 14/18] ARM: OMAP: Merge driver headers from N800 tree
- Next by Date: [PATCH 0/7] ARM: OMAP: Board updates and additions for OMAP2
- Previous by thread: [PATCH 17/18] ARM: OMAP: Device init for OMAP24xx Enhanced Audio Controller
- Next by thread: [PATCH 0/7] ARM: OMAP: Board updates and additions for OMAP2
- Index(es):
 |