diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-01 20:37:46 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-03 12:17:00 -0700 |
| commit | 0c2b4504b0ebff55b8aae2ed4816b1ef6b351c36 (patch) | |
| tree | 9b36d5da91816281eb8dc52f5aa05358aa3ffb06 | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| download | op-kernel-dev-0c2b4504b0ebff55b8aae2ed4816b1ef6b351c36.zip op-kernel-dev-0c2b4504b0ebff55b8aae2ed4816b1ef6b351c36.tar.gz | |
ARM: uniphier: drop code for old DT binding
Commit 307d40c56b0c ("ARM: uniphier: rework SMP code to support new
System Bus binding") added a new DT binding for SMP code, but still
kept old code for the backward compatibility.
Linux 4.6 was out with both bindings supported, so it should not
hurt to drop the old code now. Moreover, the mainline code are
currently not used for any of our products, so this change has
no impact on our customers in any way.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-uniphier/platsmp.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c index e802ca8..9978c41 100644 --- a/arch/arm/mach-uniphier/platsmp.c +++ b/arch/arm/mach-uniphier/platsmp.c @@ -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"); ret = of_address_to_resource(np, 0, &res); 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); if (ret) return ret; |
