mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

mach-ux500: make PRCMU base address dynamic

Browse source 
This makes the PRCMU base address be selected at runtime for U8500
and U5500 instead of being compiled-in.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2011-03-29 16:53:29 +02:00
parent 9f3c645c68
commit 118718905d
5 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-ux500/cpu-db5500.c
View file

@ -188,6 +188,8 @@ void __init u5500_map_io(void)
ux500_map_io(); ux500_map_io();
iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc)); iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc));
_PRCMU_BASE = __io_address(U5500_PRCMU_BASE);
} }
static int usb_db5500_rx_dma_cfg[] = { static int usb_db5500_rx_dma_cfg[] = {

2
arch/arm/mach-ux500/cpu-db8500.c
View file

@ -87,6 +87,8 @@ void __init u8500_map_io(void)
iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc)); iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc));
else if (cpu_is_u8500v2()) else if (cpu_is_u8500v2())
iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc)); iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));
_PRCMU_BASE = __io_address(U8500_PRCMU_BASE);
} }
static struct resource db8500_pmu_resources[] = { static struct resource db8500_pmu_resources[] = {

2
arch/arm/mach-ux500/cpu.c
View file

@ -23,6 +23,8 @@
#include "clock.h" #include "clock.h"
void __iomem *_PRCMU_BASE;
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
static void __iomem *l2x0_base; static void __iomem *l2x0_base;
#endif #endif

1
arch/arm/mach-ux500/include/mach/hardware.h
View file

@ -35,6 +35,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <mach/id.h> #include <mach/id.h>
extern void __iomem *_PRCMU_BASE;
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)

2
arch/arm/mach-ux500/include/mach/prcmu-regs.h
View file

@ -15,8 +15,6 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#define _PRCMU_BASE IO_ADDRESS(U8500_PRCMU_BASE)
#define PRCM_ARM_PLLDIVPS (_PRCMU_BASE + 0x118) #define PRCM_ARM_PLLDIVPS (_PRCMU_BASE + 0x118)
#define PRCM_ARM_CHGCLKREQ (_PRCMU_BASE + 0x114) #define PRCM_ARM_CHGCLKREQ (_PRCMU_BASE + 0x114)
#define PRCM_PLLARM_ENABLE (_PRCMU_BASE + 0x98) #define PRCM_PLLARM_ENABLE (_PRCMU_BASE + 0x98)