Commit 4de12360 authored by Arnd Bergmann's avatar Arnd Bergmann

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 30e54461 1919bff0
...@@ -147,8 +147,9 @@ int __init coherency_init(void) ...@@ -147,8 +147,9 @@ int __init coherency_init(void)
static int __init coherency_late_init(void) static int __init coherency_late_init(void)
{ {
bus_register_notifier(&platform_bus_type, if (of_find_matching_node(NULL, of_coherency_table))
&mvebu_hwcc_platform_nb); bus_register_notifier(&platform_bus_type,
&mvebu_hwcc_platform_nb);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment