|
@@ -101,21 +101,13 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus)
|
|
np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
|
|
np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
|
|
ret = of_address_to_resource(np, 0, &res);
|
|
ret = of_address_to_resource(np, 0, &res);
|
|
of_node_put(np);
|
|
of_node_put(np);
|
|
- if (!ret) {
|
|
|
|
- rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
|
|
|
|
- } else {
|
|
|
|
- /* try old binding too */
|
|
|
|
- np = of_find_compatible_node(NULL, NULL,
|
|
|
|
- "socionext,uniphier-system-bus-controller");
|
|
|
|
- ret = of_address_to_resource(np, 1, &res);
|
|
|
|
- of_node_put(np);
|
|
|
|
- if (ret) {
|
|
|
|
- pr_err("failed to get resource of SMP control\n");
|
|
|
|
- return ret;
|
|
|
|
- }
|
|
|
|
- rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2;
|
|
|
|
|
|
+ if (ret) {
|
|
|
|
+ pr_err("failed to get resource of SMP control\n");
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
|
|
|
|
+
|
|
ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
|
|
ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|