From patchwork Sun May 21 12:48:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9739003 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 CC8B760328 for ; Sun, 21 May 2017 12:50:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBF90286DC for ; Sun, 21 May 2017 12:50:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF97A286E1; Sun, 21 May 2017 12:50:40 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 0D42D286DC for ; Sun, 21 May 2017 12:50:40 +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=j6s71LjiU6fQMfbRmh9h0/MD2bOzCHkI24NWwLBdwJI=; b=bohvdo0UcnATeWjklMxFagAei5 JpjvfewRv+3qtjcQzhvlMpLWTXAPDvDbue/e7VKrN60JUpTIDCjTGHLC8oNt8kF3Op68cFCYtoiUy f+sYRaKMDw2By7gIAFrm/zczGtc/pPBmOmlrJCgLsl7pZG5PRT+cpcpwYeJ6S05OetdOytuC4vONu NNSpy4iAhXM3dN5H8Y8DwfRdPF2CDFaZr0bNkWezbyN5DBPQ9D2vdqPlw/b5ddRL6HES+frw+VR/j LkcGftzIeEaNNhuDvtWEU7Yt0nwgezem1n5+7t1flKRc+pfIZ65nQsLPZ1Q7by+UdsK4QT/h3qtEr BpSiMgDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dCQJh-00073w-Ss; Sun, 21 May 2017 12:50:37 +0000 Received: from mail-ua0-x242.google.com ([2607:f8b0:400c:c08::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCQIt-0004qK-0J for linux-arm-kernel@lists.infradead.org; Sun, 21 May 2017 12:49:53 +0000 Received: by mail-ua0-x242.google.com with SMTP id i46so5996555uaa.3 for ; Sun, 21 May 2017 05:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hXOjnONzJe4dmVBtvKBgU3szZhCKc6G7LHNuehqfykk=; b=eqEcGfMtjk1p3e/eQmuL1jcnYMWShZ6m954B3fCznli0pI7SAnU+n9IG+DkaM/vvwT e10db5oBpuLGnwFhd7AvYVTj4nXTCYvSIkMRRWyHi5TRfbC7SVcg1Rs1tX4IruJ8+mSa mfeCbIdXYXeJANO6Z35OywWAuXUsi2qbsRjF0hz9Ge41+P/5MRnd40UmMmQq6sAgHjGx DwXQYXoNeaxONqNh/2WpdTMKhwc3B0sz3pdqokneQp0G/KurDNZ+JtcIvFc5GINvvUBM ZN3SwUAMsrV1NNIF0A77cQBc8voYIGieibJiMwnpScu6ESw4mhHJgISUjclhy9nIOwQO JogQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hXOjnONzJe4dmVBtvKBgU3szZhCKc6G7LHNuehqfykk=; b=sJU51Y9+fjNqx1R1hQqyNFDpXD15Hn0P4Aex1TskvLnSJ8Yot4SQAaSR0WRYtgEGDq BaXmADID980qmeoW2Ce5h1QkRaaB74j1VVRy5p0ZTUGhChkk+9NV7lLwBpbJxjPKH7CN IPnbrGxO9axSINktCgZYss+1WVA/DCeZ6NrW2BiRd1jIbUWgrffHQypK+8U7lX1LKDF+ zAFLkPQlqG+8uKZo7r48ZunSRJybI9dNGRKvknWvNLz28su66BjnqNvKOGML0CF04GAb LpXyRQxSt9daU9xJoRCRV/uuA+qvv0ibCz/tigMRo7zAURuSHDkwgk7Ety8Z2D0sSmp4 uXdA== X-Gm-Message-State: AODbwcB0xuKsEqieQTbn+WdXUgKaX/mBNkI5XmcQoGjK18aL34pO1mSW gcX7gx/BCpPC7g== X-Received: by 10.176.4.117 with SMTP id 108mr8935732uav.34.1495370966020; Sun, 21 May 2017 05:49:26 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id q17sm2803410uab.7.2017.05.21.05.49.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 May 2017 05:49:25 -0700 (PDT) From: Ralph Sennhauser To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants Date: Sun, 21 May 2017 14:48:52 +0200 Message-Id: <20170521124903.11050-4-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170521124903.11050-1-ralph.sennhauser@gmail.com> References: <20170521124903.11050-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170521_054947_498158_733B6DC1 X-CRM114-Status: GOOD ( 11.36 ) 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 , Andrew Lunn , Jason Cooper , devicetree@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, Ralph Sennhauser , Rob Herring , Gregory Clement , Imre Kaloz , Sebastian Hesselbarth 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 Flatten dts of individual boards to match the new style used in armada-385-linksys.dtsi and for the Rango addition. * Caiman - Linksys WRT1200AC v1 & v2 * Cobra - Linksys WRT1900AC v2 * Shelby - Linksys WRT1900ACS v1 & v2 Signed-off-by: Ralph Sennhauser Reviewed-by: Andrew Lunn --- Notes: power and sata in &gpio_leds don't use references when they could, feels like overdoing things even though it violates one of the guiding principles of not recreating structure. If someone thinks such a change is meaningful I don't mind submitting a followup patch, though would look odd with the Rango dts. --- arch/arm/boot/dts/armada-385-linksys-caiman.dts | 99 ++++++++++++------------- arch/arm/boot/dts/armada-385-linksys-cobra.dts | 99 ++++++++++++------------- arch/arm/boot/dts/armada-385-linksys-shelby.dts | 99 ++++++++++++------------- 3 files changed, 138 insertions(+), 159 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts index f3cee91..765c939 100644 --- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts +++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts @@ -44,71 +44,64 @@ model = "Linksys WRT1200AC"; compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385", "marvell,armada380"; +}; - soc { - internal-regs{ - i2c@11000 { - - pca9635@68 { - #address-cells = <1>; - #size-cells = <0>; +&expander0 { + #address-cells = <1>; + #size-cells = <0>; - wan_amber@0 { - label = "caiman:amber:wan"; - reg = <0x0>; - }; + wan_amber@0 { + label = "caiman:amber:wan"; + reg = <0x0>; + }; - wan_white@1 { - label = "caiman:white:wan"; - reg = <0x1>; - }; + wan_white@1 { + label = "caiman:white:wan"; + reg = <0x1>; + }; - wlan_2g@2 { - label = "caiman:white:wlan_2g"; - reg = <0x2>; - }; + wlan_2g@2 { + label = "caiman:white:wlan_2g"; + reg = <0x2>; + }; - wlan_5g@3 { - label = "caiman:white:wlan_5g"; - reg = <0x3>; - }; + wlan_5g@3 { + label = "caiman:white:wlan_5g"; + reg = <0x3>; + }; - usb2@5 { - label = "caiman:white:usb2"; - reg = <0x5>; - }; + usb2@5 { + label = "caiman:white:usb2"; + reg = <0x5>; + }; - usb3_1@6 { - label = "caiman:white:usb3_1"; - reg = <0x6>; - }; + usb3_1@6 { + label = "caiman:white:usb3_1"; + reg = <0x6>; + }; - usb3_2@7 { - label = "caiman:white:usb3_2"; - reg = <0x7>; - }; + usb3_2@7 { + label = "caiman:white:usb3_2"; + reg = <0x7>; + }; - wps_white@8 { - label = "caiman:white:wps"; - reg = <0x8>; - }; + wps_white@8 { + label = "caiman:white:wps"; + reg = <0x8>; + }; - wps_amber@9 { - label = "caiman:amber:wps"; - reg = <0x9>; - }; - }; - }; - }; + wps_amber@9 { + label = "caiman:amber:wps"; + reg = <0x9>; }; +}; - gpio-leds { - power { - label = "caiman:white:power"; - }; +&gpio_leds { + power { + label = "caiman:white:power"; + }; - sata { - label = "caiman:white:sata"; - }; + sata { + label = "caiman:white:sata"; }; }; diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts index 1110718..2ae1e71 100644 --- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts +++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts @@ -44,71 +44,64 @@ model = "Linksys WRT1900ACv2"; compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385", "marvell,armada380"; +}; - soc { - internal-regs{ - i2c@11000 { - - pca9635@68 { - #address-cells = <1>; - #size-cells = <0>; +&expander0 { + #address-cells = <1>; + #size-cells = <0>; - wan_amber@0 { - label = "cobra:amber:wan"; - reg = <0x0>; - }; + wan_amber@0 { + label = "cobra:amber:wan"; + reg = <0x0>; + }; - wan_white@1 { - label = "cobra:white:wan"; - reg = <0x1>; - }; + wan_white@1 { + label = "cobra:white:wan"; + reg = <0x1>; + }; - wlan_2g@2 { - label = "cobra:white:wlan_2g"; - reg = <0x2>; - }; + wlan_2g@2 { + label = "cobra:white:wlan_2g"; + reg = <0x2>; + }; - wlan_5g@3 { - label = "cobra:white:wlan_5g"; - reg = <0x3>; - }; + wlan_5g@3 { + label = "cobra:white:wlan_5g"; + reg = <0x3>; + }; - usb2@5 { - label = "cobra:white:usb2"; - reg = <0x5>; - }; + usb2@5 { + label = "cobra:white:usb2"; + reg = <0x5>; + }; - usb3_1@6 { - label = "cobra:white:usb3_1"; - reg = <0x6>; - }; + usb3_1@6 { + label = "cobra:white:usb3_1"; + reg = <0x6>; + }; - usb3_2@7 { - label = "cobra:white:usb3_2"; - reg = <0x7>; - }; + usb3_2@7 { + label = "cobra:white:usb3_2"; + reg = <0x7>; + }; - wps_white@8 { - label = "cobra:white:wps"; - reg = <0x8>; - }; + wps_white@8 { + label = "cobra:white:wps"; + reg = <0x8>; + }; - wps_amber@9 { - label = "cobra:amber:wps"; - reg = <0x9>; - }; - }; - }; - }; + wps_amber@9 { + label = "cobra:amber:wps"; + reg = <0x9>; }; +}; - gpio-leds { - power { - label = "cobra:white:power"; - }; +&gpio_leds { + power { + label = "cobra:white:power"; + }; - sata { - label = "cobra:white:sata"; - }; + sata { + label = "cobra:white:sata"; }; }; diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts index c7a8ddd..74f4273 100644 --- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts +++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts @@ -44,71 +44,64 @@ model = "Linksys WRT1900ACS"; compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385", "marvell,armada380"; +}; - soc { - internal-regs{ - i2c@11000 { - - pca9635@68 { - #address-cells = <1>; - #size-cells = <0>; +&expander0 { + #address-cells = <1>; + #size-cells = <0>; - wan_amber@0 { - label = "shelby:amber:wan"; - reg = <0x0>; - }; + wan_amber@0 { + label = "shelby:amber:wan"; + reg = <0x0>; + }; - wan_white@1 { - label = "shelby:white:wan"; - reg = <0x1>; - }; + wan_white@1 { + label = "shelby:white:wan"; + reg = <0x1>; + }; - wlan_2g@2 { - label = "shelby:white:wlan_2g"; - reg = <0x2>; - }; + wlan_2g@2 { + label = "shelby:white:wlan_2g"; + reg = <0x2>; + }; - wlan_5g@3 { - label = "shelby:white:wlan_5g"; - reg = <0x3>; - }; + wlan_5g@3 { + label = "shelby:white:wlan_5g"; + reg = <0x3>; + }; - usb2@5 { - label = "shelby:white:usb2"; - reg = <0x5>; - }; + usb2@5 { + label = "shelby:white:usb2"; + reg = <0x5>; + }; - usb3_1@6 { - label = "shelby:white:usb3_1"; - reg = <0x6>; - }; + usb3_1@6 { + label = "shelby:white:usb3_1"; + reg = <0x6>; + }; - usb3_2@7 { - label = "shelby:white:usb3_2"; - reg = <0x7>; - }; + usb3_2@7 { + label = "shelby:white:usb3_2"; + reg = <0x7>; + }; - wps_white@8 { - label = "shelby:white:wps"; - reg = <0x8>; - }; + wps_white@8 { + label = "shelby:white:wps"; + reg = <0x8>; + }; - wps_amber@9 { - label = "shelby:amber:wps"; - reg = <0x9>; - }; - }; - }; - }; + wps_amber@9 { + label = "shelby:amber:wps"; + reg = <0x9>; }; +}; - gpio-leds { - power { - label = "shelby:white:power"; - }; +&gpio_leds { + power { + label = "shelby:white:power"; + }; - sata { - label = "shelby:white:sata"; - }; + sata { + label = "shelby:white:sata"; }; };