diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/board-dt.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 2f695e5b1ec7..cee5dc71cb60 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
@@ -24,11 +24,6 @@ | |||
24 | #include <plat/common.h> | 24 | #include <plat/common.h> |
25 | #include "common.h" | 25 | #include "common.h" |
26 | 26 | ||
27 | static struct of_device_id kirkwood_dt_match_table[] __initdata = { | ||
28 | { .compatible = "simple-bus", }, | ||
29 | { } | ||
30 | }; | ||
31 | |||
32 | /* | 27 | /* |
33 | * There are still devices that doesn't know about DT yet. Get clock | 28 | * There are still devices that doesn't know about DT yet. Get clock |
34 | * gates here and add a clock lookup alias, so that old platform | 29 | * gates here and add a clock lookup alias, so that old platform |
@@ -96,6 +91,8 @@ static void __init kirkwood_dt_init(void) | |||
96 | 91 | ||
97 | kirkwood_l2_init(); | 92 | kirkwood_l2_init(); |
98 | 93 | ||
94 | kirkwood_cpufreq_init(); | ||
95 | |||
99 | /* Setup root of clk tree */ | 96 | /* Setup root of clk tree */ |
100 | kirkwood_of_clk_init(); | 97 | kirkwood_of_clk_init(); |
101 | 98 | ||
@@ -146,6 +143,10 @@ static void __init kirkwood_dt_init(void) | |||
146 | of_machine_is_compatible("lacie,netspace_v2")) | 143 | of_machine_is_compatible("lacie,netspace_v2")) |
147 | ns2_init(); | 144 | ns2_init(); |
148 | 145 | ||
146 | if (of_machine_is_compatible("marvell,db-88f6281-bp") || | ||
147 | of_machine_is_compatible("marvell,db-88f6282-bp")) | ||
148 | db88f628x_init(); | ||
149 | |||
149 | if (of_machine_is_compatible("mpl,cec4")) | 150 | if (of_machine_is_compatible("mpl,cec4")) |
150 | mplcec4_init(); | 151 | mplcec4_init(); |
151 | 152 | ||
@@ -158,7 +159,7 @@ static void __init kirkwood_dt_init(void) | |||
158 | if (of_machine_is_compatible("usi,topkick")) | 159 | if (of_machine_is_compatible("usi,topkick")) |
159 | usi_topkick_init(); | 160 | usi_topkick_init(); |
160 | 161 | ||
161 | of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL); | 162 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
162 | } | 163 | } |
163 | 164 | ||
164 | static const char * const kirkwood_dt_board_compat[] = { | 165 | static const char * const kirkwood_dt_board_compat[] = { |
@@ -180,6 +181,8 @@ static const char * const kirkwood_dt_board_compat[] = { | |||
180 | "lacie,netspace_max_v2", | 181 | "lacie,netspace_max_v2", |
181 | "lacie,netspace_mini_v2", | 182 | "lacie,netspace_mini_v2", |
182 | "lacie,netspace_v2", | 183 | "lacie,netspace_v2", |
184 | "marvell,db-88f6281-bp", | ||
185 | "marvell,db-88f6282-bp", | ||
183 | "mpl,cec4", | 186 | "mpl,cec4", |
184 | "netgear,readynas-duo-v2", | 187 | "netgear,readynas-duo-v2", |
185 | "plathome,openblocks-a6", | 188 | "plathome,openblocks-a6", |