From patchwork Mon May 30 02:12:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68823 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1175260qge; Sun, 29 May 2016 19:13:41 -0700 (PDT) X-Received: by 10.66.89.228 with SMTP id br4mr42427885pab.110.1464574420973; Sun, 29 May 2016 19:13:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z19si47094112pak.141.2016.05.29.19.13.40; Sun, 29 May 2016 19:13:40 -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 S1753387AbcE3CNi (ORCPT + 30 others); Sun, 29 May 2016 22:13:38 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:24130 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752025AbcE3CNh (ORCPT ); Sun, 29 May 2016 22:13:37 -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 u4U2Ba45006840; Mon, 30 May 2016 11:11:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u4U2Ba45006840 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1464574298; bh=C/IKuqt4mVeXNqj0WbNbR8nLogrhbRWETh29k6kpo5U=; h=From:To:Cc:Subject:Date:From; b=Yg8p7xhrATzrv2thPmaYUCT4ydt+m+84DXkWcernFJ4J0rd6Wk+Mf2hqGZBwJ9++h AFpQ1Epmki4HQZm12yUG3/nSicLLWsKI06CtT1RR1n6DLtY0P2Y5laW/Z5/3zYtbEW OZ13OyKFNAHq9PVgoC9LWfaq4mdPG88+cTGj0keWPvJgg8gtvBzJ1uEzOmyOByaK5h UhEPcn9psbVaaZNae71S5QS+UHYZyRR7xd+PZw5/LMcm4dmL8oVv4xQZv+gwDjupBx Jg6odGDDW013RFCUT7y4NmdaqBoRArYVcDRkiz7uNV/f82OtidHZcll/ttATxzW5bS LnQiDn0lwQolQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: Arnd Bergmann , Olof Johansson , Rob Herring , Masahiro Yamada , Chanho Min , devicetree@vger.kernel.org, Jianqun Xu , Heiko Stuebner , Kumar Gala , linux-kernel@vger.kernel.org, Ian Campbell , linux-rockchip@lists.infradead.org, Rob Herring , Pawel Moll , Will Deacon , Mark Rutland , Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: dts: drop "arm, amba-bus" in favor of "simple-bus" part 2 Date: Mon, 30 May 2016 11:12:33 +0900 Message-Id: <1464574353-31477-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 Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some new users of "arm,amba-bus" at Linux 4.7-rc1. Eliminate them now. Signed-off-by: Masahiro Yamada --- In order to not leave these compatible strings for the release, is it OK to apply this patch for Linux 4.7 ? arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi b/arch/arm64/boot/dts/lg/lg1312.dtsi index 3a4e9a2..fbafa24 100644 --- a/arch/arm64/boot/dts/lg/lg1312.dtsi +++ b/arch/arm64/boot/dts/lg/lg1312.dtsi @@ -125,7 +125,7 @@ #size-cells = <1>; #interrupts-cells = <3>; - compatible = "arm,amba-bus"; + compatible = "simple-bus"; interrupt-parent = <&gic>; ranges; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a..d7f8e06 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -163,7 +163,7 @@ }; amba { - compatible = "arm,amba-bus"; + compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; ranges;