.. | .. |
---|
136 | 136 | |
---|
137 | 137 | of_update_property(np, new_compat); |
---|
138 | 138 | } |
---|
139 | | - return; |
---|
140 | 139 | } |
---|
141 | 140 | |
---|
142 | 141 | static void __init mvebu_dt_init(void) |
---|
143 | 142 | { |
---|
144 | 143 | if (of_machine_is_compatible("marvell,armadaxp")) |
---|
145 | 144 | i2c_quirk(); |
---|
| 145 | +} |
---|
| 146 | + |
---|
| 147 | +static void __init armada_370_xp_dt_fixup(void) |
---|
| 148 | +{ |
---|
| 149 | +#ifdef CONFIG_SMP |
---|
| 150 | + smp_set_ops(smp_ops(armada_xp_smp_ops)); |
---|
| 151 | +#endif |
---|
146 | 152 | } |
---|
147 | 153 | |
---|
148 | 154 | static const char * const armada_370_xp_dt_compat[] __initconst = { |
---|
.. | .. |
---|
153 | 159 | DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)") |
---|
154 | 160 | .l2c_aux_val = 0, |
---|
155 | 161 | .l2c_aux_mask = ~0, |
---|
156 | | -/* |
---|
157 | | - * The following field (.smp) is still needed to ensure backward |
---|
158 | | - * compatibility with old Device Trees that were not specifying the |
---|
159 | | - * cpus enable-method property. |
---|
160 | | - */ |
---|
161 | | - .smp = smp_ops(armada_xp_smp_ops), |
---|
162 | 162 | .init_machine = mvebu_dt_init, |
---|
163 | 163 | .init_irq = mvebu_init_irq, |
---|
164 | 164 | .restart = mvebu_restart, |
---|
165 | 165 | .reserve = mvebu_memblock_reserve, |
---|
166 | 166 | .dt_compat = armada_370_xp_dt_compat, |
---|
| 167 | + .dt_fixup = armada_370_xp_dt_fixup, |
---|
167 | 168 | MACHINE_END |
---|
168 | 169 | |
---|
169 | 170 | static const char * const armada_375_dt_compat[] __initconst = { |
---|