All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
To: linux-arm-kernel@lists.infradead.org
Cc: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>,
	"Daniel Mack" <daniel@zonque.org>,
	"Haojian Zhuang" <haojian.zhuang@gmail.com>,
	"Robert Jarzmik" <robert.jarzmik@free.fr>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist
Date: Thu, 24 Nov 2022 11:01:12 +0100	[thread overview]
Message-ID: <20221124100112.4172513-1-j.neuschaefer@gmx.net> (raw)

The pwri2c node does not exist in all PXA2xx SoCs (specifically not
in PXA25x), and thus isn't defined in pxa2xx.dtsi. It is, however,
currently mentioned in /aliases, causing an error when building a
devicetree that doesn't define it.

Move the mention of &pwri2c in /aliases to the files that define it
(pxa27x.dtsi and pxa3xx.dtsi), to avoid the error mentioned above.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 arch/arm/boot/dts/pxa27x.dtsi | 5 +++++
 arch/arm/boot/dts/pxa2xx.dtsi | 3 +--
 arch/arm/boot/dts/pxa3xx.dtsi | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index a2cbfb3be6090..1f217eceabbf7 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -7,6 +7,11 @@ / {
 	model = "Marvell PXA27x familiy SoC";
 	compatible = "marvell,pxa27x";

+	aliases {
+		i2c0 = &pwri2c;
+		i2c1 = &pxai2c1;
+	};
+
 	pxabus {
 		pdma: dma-controller@40000000 {
 			compatible = "marvell,pdma-1.0";
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 84154c43fe654..1332183f87456 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -38,8 +38,7 @@ aliases {
 		serial1 = &btuart;
 		serial2 = &stuart;
 		serial3 = &hwuart;
-		i2c0 = &pwri2c;
-		i2c1 = &pxai2c1;
+		i2c0 = &pxai2c1;
 	};

 	cpus {
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9c216f918653..57ff0a63e9acd 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -117,6 +117,11 @@ / {
 	model = "Marvell PXA3xx familiy SoC";
 	compatible = "marvell,pxa3xx";

+	aliases {
+		i2c0 = &pwri2c;
+		i2c1 = &pxai2c1;
+	};
+
 	pxabus {
 		pdma: dma-controller@40000000 {
 			compatible = "marvell,pdma-1.0";
--
2.35.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
To: linux-arm-kernel@lists.infradead.org
Cc: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>,
	"Daniel Mack" <daniel@zonque.org>,
	"Haojian Zhuang" <haojian.zhuang@gmail.com>,
	"Robert Jarzmik" <robert.jarzmik@free.fr>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist
Date: Thu, 24 Nov 2022 11:01:12 +0100	[thread overview]
Message-ID: <20221124100112.4172513-1-j.neuschaefer@gmx.net> (raw)

The pwri2c node does not exist in all PXA2xx SoCs (specifically not
in PXA25x), and thus isn't defined in pxa2xx.dtsi. It is, however,
currently mentioned in /aliases, causing an error when building a
devicetree that doesn't define it.

Move the mention of &pwri2c in /aliases to the files that define it
(pxa27x.dtsi and pxa3xx.dtsi), to avoid the error mentioned above.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 arch/arm/boot/dts/pxa27x.dtsi | 5 +++++
 arch/arm/boot/dts/pxa2xx.dtsi | 3 +--
 arch/arm/boot/dts/pxa3xx.dtsi | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index a2cbfb3be6090..1f217eceabbf7 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -7,6 +7,11 @@ / {
 	model = "Marvell PXA27x familiy SoC";
 	compatible = "marvell,pxa27x";

+	aliases {
+		i2c0 = &pwri2c;
+		i2c1 = &pxai2c1;
+	};
+
 	pxabus {
 		pdma: dma-controller@40000000 {
 			compatible = "marvell,pdma-1.0";
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 84154c43fe654..1332183f87456 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -38,8 +38,7 @@ aliases {
 		serial1 = &btuart;
 		serial2 = &stuart;
 		serial3 = &hwuart;
-		i2c0 = &pwri2c;
-		i2c1 = &pxai2c1;
+		i2c0 = &pxai2c1;
 	};

 	cpus {
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9c216f918653..57ff0a63e9acd 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -117,6 +117,11 @@ / {
 	model = "Marvell PXA3xx familiy SoC";
 	compatible = "marvell,pxa3xx";

+	aliases {
+		i2c0 = &pwri2c;
+		i2c1 = &pxai2c1;
+	};
+
 	pxabus {
 		pdma: dma-controller@40000000 {
 			compatible = "marvell,pdma-1.0";
--
2.35.1


             reply	other threads:[~2022-11-24 10:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-24 10:01 Jonathan Neuschäfer [this message]
2022-11-24 10:01 ` [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist Jonathan Neuschäfer
2022-11-26 10:32 ` Robert Jarzmik
2022-11-26 10:32   ` Robert Jarzmik

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=20221124100112.4172513-1-j.neuschaefer@gmx.net \
    --to=j.neuschaefer@gmx.net \
    --cc=daniel@zonque.org \
    --cc=devicetree@vger.kernel.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robert.jarzmik@free.fr \
    --cc=robh+dt@kernel.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 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.