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 4/5] arm: dts: linksys: rename caiman to wrt1200ac
Date: Tue, 7 Apr 2020 11:08:14 -1000 [thread overview]
Message-ID: <20200407210816.866084-5-mail@aparcar.org> (raw)
In-Reply-To: <20200407210816.866084-1-mail@aparcar.org>
Linksys uses internally the codename "caiman" for a device sold under
the name of "Linksys WRT1200AC", which is already reflected in the
device tree `model`. However the `compatible` list only contains the
codename `linksys,caiman` which does not relate to the common name.
This patch renames the `dts` file to the sanitized model name and
prepends `linksys,wrt1200ac` 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 +-
...n.dts => armada-385-linksys-wrt1200ac.dts} | 26 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
rename arch/arm/boot/dts/{armada-385-linksys-caiman.dts => armada-385-linksys-wrt1200ac.dts} (80%)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index be45b5fb4f95..8482bec35af4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1280,8 +1280,8 @@ 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-caiman.dtb \
armada-385-linksys-shelby.dtb \
+ armada-385-linksys-wrt1200ac.dtb \
armada-385-linksys-wrt1900ac-v2.dtb \
armada-385-linksys-wrt3200acm.dtb \
armada-385-synology-ds116.dtb \
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-wrt1200ac.dts
similarity index 80%
rename from arch/arm/boot/dts/armada-385-linksys-caiman.dts
rename to arch/arm/boot/dts/armada-385-linksys-wrt1200ac.dts
index a03050c97084..acc8338987f5 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-wrt1200ac.dts
@@ -10,64 +10,64 @@
/ {
model = "Linksys WRT1200AC";
- compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
- "marvell,armada380";
+ compatible = "linksys,wrt1200ac", "linksys,caiman", "linksys,armada385",
+ "marvell,armada385", "marvell,armada380";
};
&expander0 {
wan_amber@0 {
- label = "caiman:amber:wan";
+ label = "wrt1200ac:amber:wan";
reg = <0x0>;
};
wan_white@1 {
- label = "caiman:white:wan";
+ label = "wrt1200ac:white:wan";
reg = <0x1>;
};
wlan_2g@2 {
- label = "caiman:white:wlan_2g";
+ label = "wrt1200ac:white:wlan_2g";
reg = <0x2>;
};
wlan_5g@3 {
- label = "caiman:white:wlan_5g";
+ label = "wrt1200ac:white:wlan_5g";
reg = <0x3>;
};
usb2@5 {
- label = "caiman:white:usb2";
+ label = "wrt1200ac:white:usb2";
reg = <0x5>;
};
usb3_1@6 {
- label = "caiman:white:usb3_1";
+ label = "wrt1200ac:white:usb3_1";
reg = <0x6>;
};
usb3_2@7 {
- label = "caiman:white:usb3_2";
+ label = "wrt1200ac:white:usb3_2";
reg = <0x7>;
};
wps_white@8 {
- label = "caiman:white:wps";
+ label = "wrt1200ac:white:wps";
reg = <0x8>;
};
wps_amber@9 {
- label = "caiman:amber:wps";
+ label = "wrt1200ac:amber:wps";
reg = <0x9>;
};
};
&gpio_leds {
power {
- label = "caiman:white:power";
+ label = "wrt1200ac:white:power";
};
sata {
- label = "caiman:white:sata";
+ label = "wrt1200ac:white:sata";
};
};
--
2.25.1
next prev parent reply other threads:[~2020-04-07 21:13 UTC|newest]
Thread overview: 13+ 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 ` [PATCH 1/5] arm: dts: linksys: rename rango to wrt3200acm Paul Spooren
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 [this message]
2020-04-07 21:08 ` [PATCH 5/5] arm: dts: linksys: rename shelby to wrt1900acs Paul Spooren
2020-04-07 21:08 ` [PATCH 0/5] arm: dts: linksys: rename codename to model Paul Spooren
2020-04-07 22:46 ` Andrew Lunn
2020-04-07 23:38 ` Paul Spooren
2020-04-08 0:07 ` Florian Fainelli
[not found] ` <VI1PR02MB5325621D39BF0FFAFE3993C4A0C00@VI1PR02MB5325.eurprd02.prod.outlook.com>
2020-04-08 16:23 ` Daniel Golle
2020-04-10 9:49 ` Paul Spooren
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-5-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).