From patchwork Tue Jul 10 08:01:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 10516461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D9E3603D7 for ; Tue, 10 Jul 2018 08:20:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77E8428B68 for ; Tue, 10 Jul 2018 08:20:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6759028C6F; Tue, 10 Jul 2018 08:20:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0BCEB28B68 for ; Tue, 10 Jul 2018 08:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZE1/XpCF7rXUqHECdqjNE5YdTgfXkjIoz9jGWB05YZo=; b=KYAYsoMdUJ5a49g7DkA4fQ36Zy C0vV3xlOGUJkYnmmdA5ubzRYNxByQHTeJC7pZ466cvuaa+eJ+vnL2LnKrWni+GOo1rqzJguJRuJmo SE1K4tVGgfK9iqfVSDBvZWvdRp3MUnogZWKv6BUXwj5LUpUISAvlZwXpEifAZbo397bauJ6klNFAc FUOdtiiEHbiZcc+0xYPi4U5MG+1Ix/+ScWt5/dNa23ycjYkA0a7grDjAN/CeMUuXKN8cnjyOAx3Lk ygqr/kfRt5k//dGNn0dDWzkeJJPntuB3lgKDBqbp2YwKWGBv2guZU7b1hwdcBRashaDlmvc1UOtlR SRQvl7zQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcnsa-0004Sd-02; Tue, 10 Jul 2018 08:20:12 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcns6-0002m5-Gn for linux-arm-kernel@bombadil.infradead.org; Tue, 10 Jul 2018 08:19:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dyu4Ql5gbklokxTeobHxw8jVyog4cInive6FM+w07mY=; b=L12mjqm5aMx7i6Q1IqDv21c1G P9dD0nWvL37x2xBimsFJUQcWwlLbbSq+/sWw3B7/AVbuPRIgm4yGpUJxN5ewEVUvfb31ss+L07bdH urwSqfcM3rs2+x2h2WGDpAZYje1zePjorPy9p+EmkV4M2Dj78lPIaIJVjNoc5Llba6cOMwxFKXpvP v19MQ180wuiEGh+BAocQR8vpol9Gg5keE0x2ff+gYvRPk0oZgqzScJFSLA+DvbVbhPRDk6Cr1Fxdq 6JJGApAlOIi+/BULhgpk9YrTmDTq2zLAjWkr+h5aHU+G7moIJAuvLoJYxuPDaln4y6zzDxJ2GN48J zUPq5f6iw==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcnbP-0003ZV-Hk for linux-arm-kernel@lists.infradead.org; Tue, 10 Jul 2018 08:02:52 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 74461209C3; Tue, 10 Jul 2018 10:02:07 +0200 (CEST) Received: from localhost.localdomain (AAubervilliers-681-1-12-56.w90-88.abo.wanadoo.fr [90.88.133.56]) by mail.bootlin.com (Postfix) with ESMTPSA id 78210208C5; Tue, 10 Jul 2018 10:01:56 +0200 (CEST) From: Paul Kocialkowski To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/22] ARM: dts: sun7i-a20: Use most-qualified system control compatibles Date: Tue, 10 Jul 2018 10:01:02 +0200 Message-Id: <20180710080114.31469-11-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710080114.31469-1-paul.kocialkowski@bootlin.com> References: <20180710080114.31469-1-paul.kocialkowski@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180710_090239_269665_1AFD99BE X-CRM114-Status: GOOD ( 16.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Tom Saeger , Maxime Ripard , Andy Shevchenko , Hans Verkuil , Andrzej Hajda , linux-sunxi@googlegroups.com, Thomas Petazzoni , Ricardo Ribalda Delgado , Marco Franchi , Pawel Osciak , Todor Tomov , Laurent Pinchart , Jonathan Corbet , Neil Armstrong , Keiichi Watanabe , Chen-Yu Tsai , Jacob Chen , Geert Uytterhoeven , Sami Tolvanen , Icenowy Zheng , Arnd Bergmann , Smitha T Murthy , Randy Li , Benoit Parrot , Hans de Goede , Rob Herring , Hugues Fruchet , Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Alexandre Courbot , Greg Kroah-Hartman , Randy Dunlap , Paul Kocialkowski , Sakari Ailus , Andrew Morton , "David S . Miller" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This switches the sun7i-a20 dtsi to use the most qualified compatibles for the system-control block (previously named SRAM controller) as well as the SRAM blocks. The sun4i-a10 compatibles are kept since these hardware blocks are backward-compatible. The phandle for system control is also updated to reflect the fact that the controller described is really about system control rather than SRAM control. Signed-off-by: Paul Kocialkowski Reviewed-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun7i-a20.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e529e4ff2174..59abb623b249 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -239,8 +239,9 @@ #size-cells = <1>; ranges; - sram-controller@1c00000 { - compatible = "allwinner,sun4i-a10-sram-controller"; + system-control@1c00000 { + compatible = "allwinner,sun7i-a20-system-control", + "allwinner,sun4i-a10-system-control"; reg = <0x01c00000 0x30>; #address-cells = <1>; #size-cells = <1>; @@ -254,7 +255,8 @@ ranges = <0 0x00000000 0xc000>; emac_sram: sram-section@8000 { - compatible = "allwinner,sun4i-a10-sram-a3-a4"; + compatible = "allwinner,sun7i-a20-sram-a3-a4", + "allwinner,sun4i-a10-sram-a3-a4"; reg = <0x8000 0x4000>; status = "disabled"; }; @@ -268,7 +270,8 @@ ranges = <0 0x00010000 0x1000>; otg_sram: sram-section@0 { - compatible = "allwinner,sun4i-a10-sram-d"; + compatible = "allwinner,sun7i-a20-sram-d", + "allwinner,sun4i-a10-sram-d"; reg = <0x0000 0x1000>; status = "disabled"; };