From: Paul Spooren <mail@aparcar.org> 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 <mail@aparcar.org> Subject: [PATCH 2/5] arm: dts: linksys: rename mamba to wrt1900ac Date: Tue, 7 Apr 2020 11:08:12 -1000 [thread overview] Message-ID: <20200407210816.866084-3-mail@aparcar.org> (raw) In-Reply-To: <20200407210816.866084-1-mail@aparcar.org> Linksys uses internally the codename "mamba" for a device sold under the name of "Linksys WRT1900AC", which is already reflected in the device tree `model`. However the `compatible` list only contains the codename `linksys,mamba` which does not relate to the common name. This patch renames the `dts` file to the sanitized model name and prepends `linksys,wrt1900ac` to the `compatible` list to simplify the device relation. Signed-off-by: Paul Spooren <mail@aparcar.org> CC: Rob Herring <robh+dt@kernel.org> CC: Jason Cooper <jason@lakedaemon.net> CC: Andrew Lunn <andrew@lunn.ch> CC: Gregory Clement <gregory.clement@bootlin.com> CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> CC: Daniel Golle <daniel@makrotopia.org> CC: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- arch/arm/boot/dts/Makefile | 2 +- ...ba.dts => armada-xp-linksys-wrt1900ac.dts} | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) rename arch/arm/boot/dts/{armada-xp-linksys-mamba.dts => armada-xp-linksys-wrt1900ac.dts} (92%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a0df7f97cc44..cf288adb8fe0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1302,7 +1302,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-lenovo-ix4-300d.dtb \ - armada-xp-linksys-mamba.dtb \ + armada-xp-linksys-wrt1900ac.dtb \ armada-xp-matrix.dtb \ armada-xp-netgear-rn2120.dtb \ armada-xp-openblocks-ax3-4.dtb \ diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts similarity index 92% rename from arch/arm/boot/dts/armada-xp-linksys-mamba.dts rename to arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts index 8480a16919a0..2644870fec2c 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts @@ -23,8 +23,9 @@ / { model = "Linksys WRT1900AC"; - compatible = "linksys,mamba", "marvell,armadaxp-mv78230", - "marvell,armadaxp", "marvell,armada-370-xp"; + compatible = "linksys,wrt1900ac", "linksys,mamba", + "marvell,armadaxp-mv78230", "marvell,armadaxp", + "marvell,armada-370-xp"; chosen { bootargs = "console=ttyS0,115200"; @@ -110,53 +111,53 @@ tlc59116@68 { reg = <0x68>; wan_amber@0 { - label = "mamba:amber:wan"; + label = "wrt1900ac:amber:wan"; reg = <0x0>; }; wan_white@1 { - label = "mamba:white:wan"; + label = "wrt1900ac:white:wan"; reg = <0x1>; }; wlan_2g@2 { - label = "mamba:white:wlan_2g"; + label = "wrt1900ac:white:wlan_2g"; reg = <0x2>; }; wlan_5g@3 { - label = "mamba:white:wlan_5g"; + label = "wrt1900ac:white:wlan_5g"; reg = <0x3>; }; esata@4 { - label = "mamba:white:esata"; + label = "wrt1900ac:white:esata"; reg = <0x4>; linux,default-trigger = "disk-activity"; }; usb2@5 { - label = "mamba:white:usb2"; + label = "wrt1900ac:white:usb2"; reg = <0x5>; }; usb3_1@6 { - label = "mamba:white:usb3_1"; + label = "wrt1900ac:white:usb3_1"; reg = <0x6>; }; usb3_2@7 { - label = "mamba:white:usb3_2"; + label = "wrt1900ac:white:usb3_2"; reg = <0x7>; }; wps_white@8 { - label = "mamba:white:wps"; + label = "wrt1900ac:white:wps"; reg = <0x8>; }; wps_amber@9 { - label = "mamba:amber:wps"; + label = "wrt1900ac:amber:wps"; reg = <0x9>; }; }; @@ -198,7 +199,7 @@ gpio-leds { pinctrl-names = "default"; power { - label = "mamba:white:power"; + label = "wrt1900ac:white:power"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; default-state = "on"; }; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Spooren <mail@aparcar.org> To: devicetree@vger.kernel.org Cc: andrew@lunn.ch, jason@lakedaemon.net, Paul Spooren <mail@aparcar.org>, gregory.clement@bootlin.com, linux-kernel@vger.kernel.org, daniel@makrotopia.org, freifunk@adrianschmutzler.de, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, sebastian.hesselbarth@gmail.com Subject: [PATCH 2/5] arm: dts: linksys: rename mamba to wrt1900ac Date: Tue, 7 Apr 2020 11:08:12 -1000 [thread overview] Message-ID: <20200407210816.866084-3-mail@aparcar.org> (raw) In-Reply-To: <20200407210816.866084-1-mail@aparcar.org> Linksys uses internally the codename "mamba" for a device sold under the name of "Linksys WRT1900AC", which is already reflected in the device tree `model`. However the `compatible` list only contains the codename `linksys,mamba` which does not relate to the common name. This patch renames the `dts` file to the sanitized model name and prepends `linksys,wrt1900ac` to the `compatible` list to simplify the device relation. Signed-off-by: Paul Spooren <mail@aparcar.org> CC: Rob Herring <robh+dt@kernel.org> CC: Jason Cooper <jason@lakedaemon.net> CC: Andrew Lunn <andrew@lunn.ch> CC: Gregory Clement <gregory.clement@bootlin.com> CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> CC: Daniel Golle <daniel@makrotopia.org> CC: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- arch/arm/boot/dts/Makefile | 2 +- ...ba.dts => armada-xp-linksys-wrt1900ac.dts} | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) rename arch/arm/boot/dts/{armada-xp-linksys-mamba.dts => armada-xp-linksys-wrt1900ac.dts} (92%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a0df7f97cc44..cf288adb8fe0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1302,7 +1302,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-lenovo-ix4-300d.dtb \ - armada-xp-linksys-mamba.dtb \ + armada-xp-linksys-wrt1900ac.dtb \ armada-xp-matrix.dtb \ armada-xp-netgear-rn2120.dtb \ armada-xp-openblocks-ax3-4.dtb \ diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts similarity index 92% rename from arch/arm/boot/dts/armada-xp-linksys-mamba.dts rename to arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts index 8480a16919a0..2644870fec2c 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts @@ -23,8 +23,9 @@ / { model = "Linksys WRT1900AC"; - compatible = "linksys,mamba", "marvell,armadaxp-mv78230", - "marvell,armadaxp", "marvell,armada-370-xp"; + compatible = "linksys,wrt1900ac", "linksys,mamba", + "marvell,armadaxp-mv78230", "marvell,armadaxp", + "marvell,armada-370-xp"; chosen { bootargs = "console=ttyS0,115200"; @@ -110,53 +111,53 @@ tlc59116@68 { reg = <0x68>; wan_amber@0 { - label = "mamba:amber:wan"; + label = "wrt1900ac:amber:wan"; reg = <0x0>; }; wan_white@1 { - label = "mamba:white:wan"; + label = "wrt1900ac:white:wan"; reg = <0x1>; }; wlan_2g@2 { - label = "mamba:white:wlan_2g"; + label = "wrt1900ac:white:wlan_2g"; reg = <0x2>; }; wlan_5g@3 { - label = "mamba:white:wlan_5g"; + label = "wrt1900ac:white:wlan_5g"; reg = <0x3>; }; esata@4 { - label = "mamba:white:esata"; + label = "wrt1900ac:white:esata"; reg = <0x4>; linux,default-trigger = "disk-activity"; }; usb2@5 { - label = "mamba:white:usb2"; + label = "wrt1900ac:white:usb2"; reg = <0x5>; }; usb3_1@6 { - label = "mamba:white:usb3_1"; + label = "wrt1900ac:white:usb3_1"; reg = <0x6>; }; usb3_2@7 { - label = "mamba:white:usb3_2"; + label = "wrt1900ac:white:usb3_2"; reg = <0x7>; }; wps_white@8 { - label = "mamba:white:wps"; + label = "wrt1900ac:white:wps"; reg = <0x8>; }; wps_amber@9 { - label = "mamba:amber:wps"; + label = "wrt1900ac:amber:wps"; reg = <0x9>; }; }; @@ -198,7 +199,7 @@ gpio-leds { pinctrl-names = "default"; power { - label = "mamba:white:power"; + label = "wrt1900ac:white:power"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; default-state = "on"; }; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-07 21:13 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-07 21:08 [PATCH 0/5] arm: dts: linksys: rename codename to model Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 21:08 ` [PATCH 1/5] arm: dts: linksys: rename rango to wrt3200acm Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 21:08 ` Paul Spooren [this message] 2020-04-07 21:08 ` [PATCH 2/5] arm: dts: linksys: rename mamba to wrt1900ac Paul Spooren 2020-04-07 21:08 ` [PATCH 3/5] arm: dts: linksys: rename cobra to wrt1900ac-v2 Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 21:08 ` [PATCH 4/5] arm: dts: linksys: rename caiman to wrt1200ac Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 21:08 ` [PATCH 5/5] arm: dts: linksys: rename shelby to wrt1900acs Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 21:08 ` [PATCH 0/5] arm: dts: linksys: rename codename to model Paul Spooren 2020-04-07 21:08 ` Paul Spooren 2020-04-07 22:46 ` Andrew Lunn 2020-04-07 22:46 ` Andrew Lunn 2020-04-07 23:38 ` Paul Spooren 2020-04-07 23:38 ` Paul Spooren 2020-04-08 0:07 ` Florian Fainelli 2020-04-08 0:07 ` Florian Fainelli [not found] ` <VI1PR02MB5325621D39BF0FFAFE3993C4A0C00@VI1PR02MB5325.eurprd02.prod.outlook.com> 2020-04-08 16:23 ` Daniel Golle 2020-04-08 16:23 ` Daniel Golle 2020-04-10 9:49 ` Paul Spooren 2020-04-10 9:49 ` Paul Spooren 2020-04-08 0:09 ` Andrew Lunn 2020-04-08 0:09 ` Andrew Lunn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200407210816.866084-3-mail@aparcar.org \ --to=mail@aparcar.org \ --cc=andrew@lunn.ch \ --cc=daniel@makrotopia.org \ --cc=devicetree@vger.kernel.org \ --cc=freifunk@adrianschmutzler.de \ --cc=gregory.clement@bootlin.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.