forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/mach-mvebu/board-v7.c
....@@ -136,13 +136,19 @@
136136
137137 of_update_property(np, new_compat);
138138 }
139
- return;
140139 }
141140
142141 static void __init mvebu_dt_init(void)
143142 {
144143 if (of_machine_is_compatible("marvell,armadaxp"))
145144 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
146152 }
147153
148154 static const char * const armada_370_xp_dt_compat[] __initconst = {
....@@ -153,17 +159,12 @@
153159 DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
154160 .l2c_aux_val = 0,
155161 .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),
162162 .init_machine = mvebu_dt_init,
163163 .init_irq = mvebu_init_irq,
164164 .restart = mvebu_restart,
165165 .reserve = mvebu_memblock_reserve,
166166 .dt_compat = armada_370_xp_dt_compat,
167
+ .dt_fixup = armada_370_xp_dt_fixup,
167168 MACHINE_END
168169
169170 static const char * const armada_375_dt_compat[] __initconst = {