From patchwork Tue Apr 7 21:08:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 202315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCA30C2BB54 for ; Tue, 7 Apr 2020 21:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93EB820769 for ; Tue, 7 Apr 2020 21:12:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726495AbgDGVM5 (ORCPT ); Tue, 7 Apr 2020 17:12:57 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:52747 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726483AbgDGVM4 (ORCPT ); Tue, 7 Apr 2020 17:12:56 -0400 X-Originating-IP: 72.234.141.215 Received: from tb.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id A228FFF803; Tue, 7 Apr 2020 21:12:50 +0000 (UTC) From: Paul Spooren To: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, daniel@makrotopia.org, freifunk@adrianschmutzler.de, Paul Spooren Subject: [PATCH 1/5] arm: dts: linksys: rename rango to wrt3200acm Date: Tue, 7 Apr 2020 11:08:11 -1000 Message-Id: <20200407210816.866084-2-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200407210816.866084-1-mail@aparcar.org> References: <20200407210816.866084-1-mail@aparcar.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Linksys uses internally the codename "rango" for a device sold under the name of "Linksys WRT3200ACM", which is already reflected in the device tree `model`. However the `compatible` list only contains the codename `linksys,rango` which does not relate to the common name. This patch renames the `dts` file to the sanitized model name and prepends `linksys,wrt3200acm` to the `compatible` list to simplify the device relation. Signed-off-by: Paul Spooren CC: Rob Herring CC: Jason Cooper CC: Andrew Lunn CC: Gregory Clement CC: Sebastian Hesselbarth CC: Daniel Golle CC: Adrian Schmutzler --- arch/arm/boot/dts/Makefile | 2 +- ....dts => armada-385-linksys-wrt3200acm.dts} | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename arch/arm/boot/dts/{armada-385-linksys-rango.dts => armada-385-linksys-wrt3200acm.dts} (83%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e8dd99201397..a0df7f97cc44 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1282,8 +1282,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ - armada-385-linksys-rango.dtb \ armada-385-linksys-shelby.dtb \ + armada-385-linksys-wrt3200acm.dtb \ armada-385-synology-ds116.dtb \ armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-wrt3200acm.dts similarity index 83% rename from arch/arm/boot/dts/armada-385-linksys-rango.dts rename to arch/arm/boot/dts/armada-385-linksys-wrt3200acm.dts index 3c4af57ec2b9..bf7b546e3344 100644 --- a/arch/arm/boot/dts/armada-385-linksys-rango.dts +++ b/arch/arm/boot/dts/armada-385-linksys-wrt3200acm.dts @@ -12,43 +12,43 @@ / { model = "Linksys WRT3200ACM"; - compatible = "linksys,rango", "linksys,armada385", "marvell,armada385", - "marvell,armada380"; + compatible = "linksys,wrt3200acm", "linksys,rango", "linksys,armada385", + "marvell,armada385", "marvell,armada380"; }; &expander0 { wan_amber@0 { - label = "rango:amber:wan"; + label = "wrt3200acm:amber:wan"; reg = <0x0>; }; wan_white@1 { - label = "rango:white:wan"; + label = "wrt3200acm:white:wan"; reg = <0x1>; }; usb2@5 { - label = "rango:white:usb2"; + label = "wrt3200acm:white:usb2"; reg = <0x5>; }; usb3_1@6 { - label = "rango:white:usb3_1"; + label = "wrt3200acm:white:usb3_1"; reg = <0x6>; }; usb3_2@7 { - label = "rango:white:usb3_2"; + label = "wrt3200acm:white:usb3_2"; reg = <0x7>; }; wps_white@8 { - label = "rango:white:wps"; + label = "wrt3200acm:white:wps"; reg = <0x8>; }; wps_amber@9 { - label = "rango:amber:wps"; + label = "wrt3200acm:amber:wps"; reg = <0x9>; }; }; @@ -56,22 +56,22 @@ wps_amber@9 { &gpio_leds { power { gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; - label = "rango:white:power"; + label = "wrt3200acm:white:power"; }; sata { gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; - label = "rango:white:sata"; + label = "wrt3200acm:white:sata"; }; wlan_2g { gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; - label = "rango:white:wlan_2g"; + label = "wrt3200acm:white:wlan_2g"; }; wlan_5g { gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; - label = "rango:white:wlan_5g"; + label = "wrt3200acm:white:wlan_5g"; }; }; From patchwork Tue Apr 7 21:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 202314 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DAA9C2D0EC for ; Tue, 7 Apr 2020 21:13:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5537020769 for ; Tue, 7 Apr 2020 21:13:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgDGVNJ (ORCPT ); Tue, 7 Apr 2020 17:13:09 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:49633 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726370AbgDGVNJ (ORCPT ); Tue, 7 Apr 2020 17:13:09 -0400 X-Originating-IP: 72.234.141.215 Received: from tb.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 35BF5FF808; Tue, 7 Apr 2020 21:13:01 +0000 (UTC) From: Paul Spooren To: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, daniel@makrotopia.org, freifunk@adrianschmutzler.de, Paul Spooren Subject: [PATCH 3/5] arm: dts: linksys: rename cobra to wrt1900ac-v2 Date: Tue, 7 Apr 2020 11:08:13 -1000 Message-Id: <20200407210816.866084-4-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200407210816.866084-1-mail@aparcar.org> References: <20200407210816.866084-1-mail@aparcar.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Linksys uses internally the codename "cobra" for a device sold under the name of "Linksys WRT1900ACv2", which is already reflected in the device tree `model`. However the `compatible` list only contains the codename `linksys,cobra` which does not relate to the common name. This patch renames the `dts` file to the sanitized model name and prepends `linksys,wrt1900ac-v2` to the `compatible` list to simplify the device relation. For consistency with other models containing a version number a space was added in the DT `model` to sepparate the *v2* and also reflected in the `dts` filename containing `-v2`. Signed-off-by: Paul Spooren CC: Rob Herring CC: Jason Cooper CC: Andrew Lunn CC: Gregory Clement CC: Sebastian Hesselbarth CC: Daniel Golle CC: Adrian Schmutzler --- arch/arm/boot/dts/Makefile | 2 +- ...ts => armada-385-linksys-wrt1900ac-v2.dts} | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) rename arch/arm/boot/dts/{armada-385-linksys-cobra.dts => armada-385-linksys-wrt1900ac-v2.dts} (78%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cf288adb8fe0..be45b5fb4f95 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1281,8 +1281,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-88f6820-amc.dtb \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ - armada-385-linksys-cobra.dtb \ armada-385-linksys-shelby.dtb \ + armada-385-linksys-wrt1900ac-v2.dtb \ armada-385-linksys-wrt3200acm.dtb \ armada-385-synology-ds116.dtb \ armada-385-turris-omnia.dtb \ diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts similarity index 78% rename from arch/arm/boot/dts/armada-385-linksys-cobra.dts rename to arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts index e3e4877a6f49..8f78350fa988 100644 --- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts +++ b/arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts @@ -9,65 +9,66 @@ #include "armada-385-linksys.dtsi" / { - model = "Linksys WRT1900ACv2"; - compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385", + model = "Linksys WRT1900AC v2"; + compatible = "linksys,wrt1900ac-v2", "linksys,cobra", + "linksys,armada385", "marvell,armada385", "marvell,armada380"; }; &expander0 { wan_amber@0 { - label = "cobra:amber:wan"; + label = "wrt1900ac-v2:amber:wan"; reg = <0x0>; }; wan_white@1 { - label = "cobra:white:wan"; + label = "wrt1900ac-v2:white:wan"; reg = <0x1>; }; wlan_2g@2 { - label = "cobra:white:wlan_2g"; + label = "wrt1900ac-v2:white:wlan_2g"; reg = <0x2>; }; wlan_5g@3 { - label = "cobra:white:wlan_5g"; + label = "wrt1900ac-v2:white:wlan_5g"; reg = <0x3>; }; usb2@5 { - label = "cobra:white:usb2"; + label = "wrt1900ac-v2:white:usb2"; reg = <0x5>; }; usb3_1@6 { - label = "cobra:white:usb3_1"; + label = "wrt1900ac-v2:white:usb3_1"; reg = <0x6>; }; usb3_2@7 { - label = "cobra:white:usb3_2"; + label = "wrt1900ac-v2:white:usb3_2"; reg = <0x7>; }; wps_white@8 { - label = "cobra:white:wps"; + label = "wrt1900ac-v2:white:wps"; reg = <0x8>; }; wps_amber@9 { - label = "cobra:amber:wps"; + label = "wrt1900ac-v2:amber:wps"; reg = <0x9>; }; }; &gpio_leds { power { - label = "cobra:white:power"; + label = "wrt1900ac-v2:white:power"; }; sata { - label = "cobra:white:sata"; + label = "wrt1900ac-v2:white:sata"; }; }; From patchwork Tue Apr 7 21:08:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 202313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A55B7C2D0EC for ; Tue, 7 Apr 2020 21:13:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E13220771 for ; Tue, 7 Apr 2020 21:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726380AbgDGVNX (ORCPT ); Tue, 7 Apr 2020 17:13:23 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:42063 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726370AbgDGVNW (ORCPT ); Tue, 7 Apr 2020 17:13:22 -0400 X-Originating-IP: 72.234.141.215 Received: from tb.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 61CE5FF803; Tue, 7 Apr 2020 21:13:14 +0000 (UTC) From: Paul Spooren To: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, daniel@makrotopia.org, freifunk@adrianschmutzler.de, Paul Spooren Subject: [PATCH 5/5] arm: dts: linksys: rename shelby to wrt1900acs Date: Tue, 7 Apr 2020 11:08:15 -1000 Message-Id: <20200407210816.866084-6-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200407210816.866084-1-mail@aparcar.org> References: <20200407210816.866084-1-mail@aparcar.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Linksys uses internally the codename "shelby" for a device sold under the name of "Linksys WRT1900ACS", which is already reflected in the device tree `model`. However the `compatible` list only contains the codename `linksys,shelby` which does not relate to the common name. This patch renames the `dts` file to the sanitized model name and prepends `linksys,wrt1900acs` to the `compatible` list to simplify the device relation. Signed-off-by: Paul Spooren CC: Rob Herring CC: Jason Cooper CC: Andrew Lunn CC: Gregory Clement CC: Sebastian Hesselbarth CC: Daniel Golle CC: Adrian Schmutzler --- arch/arm/boot/dts/Makefile | 2 +- ....dts => armada-385-linksys-wrt1900acs.dts} | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) rename arch/arm/boot/dts/{armada-385-linksys-shelby.dts => armada-385-linksys-wrt1900acs.dts} (80%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8482bec35af4..f59bcb23db91 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1280,9 +1280,9 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-clearfog-gtr-l8.dtb \ armada-385-db-88f6820-amc.dtb \ armada-385-db-ap.dtb \ - armada-385-linksys-shelby.dtb \ armada-385-linksys-wrt1200ac.dtb \ armada-385-linksys-wrt1900ac-v2.dtb \ + armada-385-linksys-wrt1900acs.dtb \ armada-385-linksys-wrt3200acm.dtb \ armada-385-synology-ds116.dtb \ armada-385-turris-omnia.dtb \ diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-wrt1900acs.dts similarity index 80% rename from arch/arm/boot/dts/armada-385-linksys-shelby.dts rename to arch/arm/boot/dts/armada-385-linksys-wrt1900acs.dts index 3451cd3e5dff..866f3fad19fa 100644 --- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts +++ b/arch/arm/boot/dts/armada-385-linksys-wrt1900acs.dts @@ -10,64 +10,65 @@ / { model = "Linksys WRT1900ACS"; - compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385", + compatible = "linksys,wrt1900acs", "linksys,shelby", + "linksys,armada385", "marvell,armada385", "marvell,armada380"; }; &expander0 { wan_amber@0 { - label = "shelby:amber:wan"; + label = "wrt1900acs:amber:wan"; reg = <0x0>; }; wan_white@1 { - label = "shelby:white:wan"; + label = "wrt1900acs:white:wan"; reg = <0x1>; }; wlan_2g@2 { - label = "shelby:white:wlan_2g"; + label = "wrt1900acs:white:wlan_2g"; reg = <0x2>; }; wlan_5g@3 { - label = "shelby:white:wlan_5g"; + label = "wrt1900acs:white:wlan_5g"; reg = <0x3>; }; usb2@5 { - label = "shelby:white:usb2"; + label = "wrt1900acs:white:usb2"; reg = <0x5>; }; usb3_1@6 { - label = "shelby:white:usb3_1"; + label = "wrt1900acs:white:usb3_1"; reg = <0x6>; }; usb3_2@7 { - label = "shelby:white:usb3_2"; + label = "wrt1900acs:white:usb3_2"; reg = <0x7>; }; wps_white@8 { - label = "shelby:white:wps"; + label = "wrt1900acs:white:wps"; reg = <0x8>; }; wps_amber@9 { - label = "shelby:amber:wps"; + label = "wrt1900acs:amber:wps"; reg = <0x9>; }; }; &gpio_leds { power { - label = "shelby:white:power"; + label = "wrt1900acs:white:power"; }; sata { - label = "shelby:white:sata"; + label = "wrt1900acs:white:sata"; }; };