From: Maxime Ripard <maxime.ripard@bootlin.com>
To: Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Chen-Yu Tsai <wens@csie.org>,
Maxime Ripard <maxime.ripard@bootlin.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] ARM: dts: sun7i: icnova-swac: Fix the model vendor
Date: Sat, 25 May 2019 15:41:39 +0200 [thread overview]
Message-ID: <20190525134140.6220-4-maxime.ripard@bootlin.com> (raw)
In-Reply-To: <20190525134140.6220-1-maxime.ripard@bootlin.com>
Even though the SWAC is just a baseboard to the icnova SoM, the vendor of
the baseboard somehow ended up with the board name instead of the vendor
name. Fix that.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +-
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 285f4fc8519d..000a00d12d6a 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -263,7 +263,7 @@ properties:
- description: ICNova A20 SWAC
items:
- - const: swac,icnova-a20-swac
+ - const: incircuit,icnova-a20-swac
- const: incircuit,icnova-a20
- const: allwinner,sun7i-a20
diff --git a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
index 949494730aee..7449aac3f43b 100644
--- a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
+++ b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
@@ -49,7 +49,8 @@
/ {
model = "ICnova-A20 SWAC";
- compatible = "swac,icnova-a20-swac", "incircuit,icnova-a20", "allwinner,sun7i-a20";
+ compatible = "incircuit,icnova-a20-swac", "incircuit,icnova-a20",
+ "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
--
2.21.0
next prev parent reply other threads:[~2019-05-25 13:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 13:41 [PATCH 1/5] dt-bindings: vendor: Escape single quote Maxime Ripard
2019-05-25 13:41 ` [PATCH 2/5] dt-bindings: vendor: Fix simtek vendor compatible Maxime Ripard
2019-05-26 16:05 ` Rob Herring
2019-05-25 13:41 ` [PATCH 3/5] dt-bindings: vendor: Add a bunch of vendors Maxime Ripard
2019-05-26 16:06 ` Rob Herring
2019-05-28 6:34 ` Maxime Ripard
2019-06-10 22:18 ` Rob Herring
2019-05-25 13:41 ` Maxime Ripard [this message]
2019-05-29 7:26 ` [PATCH 4/5] ARM: dts: sun7i: icnova-swac: Fix the model vendor Maxime Ripard
2019-05-25 13:41 ` [PATCH 5/5] ARM: dts: gr8-evb: Fix RTC vendor Maxime Ripard
2019-05-29 7:27 ` Maxime Ripard
2019-05-26 16:04 ` [PATCH 1/5] dt-bindings: vendor: Escape single quote Rob Herring
2019-06-11 21:18 ` Rob Herring
2019-06-12 15:48 ` Maxime Ripard
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=20190525134140.6220-4-maxime.ripard@bootlin.com \
--to=maxime.ripard@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/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).