From patchwork Wed Dec 12 15:25:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 1867611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E3185DF215 for ; Wed, 12 Dec 2012 15:28:42 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TioBg-00068S-81; Wed, 12 Dec 2012 15:25:32 +0000 Received: from mail.free-electrons.com ([88.190.12.23]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TioBd-00067W-3s for linux-arm-kernel@lists.infradead.org; Wed, 12 Dec 2012 15:25:29 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 7BE08135; Wed, 12 Dec 2012 16:25:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9055BC0; Wed, 12 Dec 2012 16:25:12 +0100 (CET) From: Maxime Ripard To: Arnd Bergmann , Olof Johansson Subject: [PATCH] ARM: sunxi: Change dtsi naming scheme for sun5i Date: Wed, 12 Dec 2012 16:25:15 +0100 Message-Id: <1355325915-22375-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121212_102529_340113_F6D8DD0D X-CRM114-Status: GOOD ( 10.94 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Alejandro Mery , Stefan Roese , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org There is several different SoCs sharing the sun5i codename: A10s, A12 and A13. Since there is enough differences to not consider those the same SoCs, change a bit the naming scheme to reflect this. Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} | 0 arch/arm/boot/dts/sun5i-olinuxino.dts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} (100%) diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi similarity index 100% rename from arch/arm/boot/dts/sun5i.dtsi rename to arch/arm/boot/dts/sun5i-a13.dtsi diff --git a/arch/arm/boot/dts/sun5i-olinuxino.dts b/arch/arm/boot/dts/sun5i-olinuxino.dts index d6ff889..498a091 100644 --- a/arch/arm/boot/dts/sun5i-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-olinuxino.dts @@ -12,11 +12,11 @@ */ /dts-v1/; -/include/ "sun5i.dtsi" +/include/ "sun5i-a13.dtsi" / { model = "Olimex A13-Olinuxino"; - compatible = "olimex,a13-olinuxino", "allwinner,sun5i"; + compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; chosen { bootargs = "earlyprintk console=ttyS0,115200";