2022-11-24 10:19:54

by Jonathan Neuschäfer

Subject: [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist

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 <[email protected]>
---
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

2022-11-26 11:06:22

by Robert Jarzmik

Subject: Re: [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist

Jonathan Neuschäfer <[email protected]> writes:

> 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 <[email protected]>
Acked-by: Robert Jarzmik <[email protected]>

Cheers.

--
Robert