From patchwork Wed Jun 1 11:37:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69022 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp41035qge; Wed, 1 Jun 2016 04:37:51 -0700 (PDT) X-Received: by 10.107.34.213 with SMTP id i204mr4413114ioi.39.1464781071199; Wed, 01 Jun 2016 04:37:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z6si10060303paa.60.2016.06.01.04.37.50; Wed, 01 Jun 2016 04:37:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757564AbcFALhn (ORCPT + 30 others); Wed, 1 Jun 2016 07:37:43 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:48026 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757392AbcFALhl (ORCPT ); Wed, 1 Jun 2016 07:37:41 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id u51BaTUT017302; Wed, 1 Jun 2016 20:36:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u51BaTUT017302 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1464780990; bh=Oz/Xp/wdpuj3CICl6iJxkzB86/RmDceMfZrqU10Csfk=; h=From:To:Cc:Subject:Date:From; b=WurKhmm7Fbgq3XFlxFvDvDS2NCoDkciU7S1MFL1W3R/zVfCwWr/M42kg50T9PNVni JjQtTxgCJu5V4choVMp+BBYnSRCIvdzH+5TSCDphdRyG8H8G/V4+UeAqEx0kO8Uqs4 5vEPOW5n5ey9xdhB/q7OQHVpvmm375hv0AYsesOjll2ahIufmf50R1Yd6cCKc+QYLL DXAIW7ANZs2mUqbNvB0OWqByrXr6RiIxHDo3aNzCNSZa1jp0KcTEj7/QKYuTQbHk4d /gCPmYslnc28v9YFiTjNP3Ya+AMTE1abo2sBCF5Ivg100pokCzwzZwX04A3/FphjeZ 0LRVf88fxRihA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: Masahiro Yamada , linux-arm-kernel@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: uniphier: drop code for old DT binding Date: Wed, 1 Jun 2016 20:37:46 +0900 Message-Id: <1464781066-25975-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Changes in v2: - Add more explanation in git-log arch/arm/mach-uniphier/platsmp.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) -- 1.9.1 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;