diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 20:00:08 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 20:00:08 +0200 |
| commit | 4de1236010c4649420a6fd87051ddc3e1fa5cb91 (patch) | |
| tree | 7a6ec1359bf804af3bd5a690cd5bfc4f2f4192a1 /arch/arm/mach-mvebu | |
| parent | 30e544612c4c64eb992244607ac16aea79f824b7 (diff) | |
| parent | 1919bff0e25f5f7ce43474a3b972405f51023e99 (diff) | |
Merge tag 'regmap-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper:
mvebu register map changes for v3.11 (round 2)
This series removes the hardcoded register base address for mvebu.
For round 2:
- multiplatform
- fix booting on anything other than mvebu
Depends (none new for round 2):
- mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
- mvebu/cleanup (up to tags/cleanup-3.11-3)
* tag 'regmap-3.11-2' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: fix coherency_late_init() for multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index 32fcf69f4202..be117591f7f2 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -147,8 +147,9 @@ int __init coherency_init(void) static int __init coherency_late_init(void) { - bus_register_notifier(&platform_bus_type, - &mvebu_hwcc_platform_nb); + if (of_find_matching_node(NULL, of_coherency_table)) + bus_register_notifier(&platform_bus_type, + &mvebu_hwcc_platform_nb); return 0; } |