[PATCH 0/4] ARM: dts: at91: calao_usb: clean up and remove usb_a9g20_common.dtsi

[PATCH 0/4] ARM: dts: at91: calao_usb: clean up and remove usb_a9g20_common.dtsi

[Wolfram Sang]

My USB-A9G20 definitely has no external RTC, unlike the LPW version.
While fixing that, I noticed that this renders the whole a9g20 include
obsolete. Here is a complete series doing that.


Wolfram Sang (4):
  ARM: dts: at91: calao_usb: simplify memory node
  ARM: dts: at91: usb_a9260: use 'stdout-path'
  ARM: dts: at91: calao_usb: simplify chosen node
  ARM: dts: at91: usb_a9g20: move wrong RTC node

 arch/arm/boot/dts/microchip/usb_a9260.dts     |  8 ------
 .../boot/dts/microchip/usb_a9260_common.dtsi  |  9 +++++++
 arch/arm/boot/dts/microchip/usb_a9g20.dts     |  3 ++-
 .../boot/dts/microchip/usb_a9g20_common.dtsi  | 27 -------------------
 arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts | 10 ++++++-
 5 files changed, 20 insertions(+), 37 deletions(-)
 delete mode 100644 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi

-- 
2.47.2

[PATCH 1/4] ARM: dts: at91: calao_usb: simplify memory node

[Wolfram Sang]

All devices have 64MB RAM. So, the memory node can bet put into the
most generic DTSI.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/microchip/usb_a9260.dts         | 4 ----
 arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 4 ++++
 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts
index e7f7b259ccf3..de19904e9e91 100644
--- a/arch/arm/boot/dts/microchip/usb_a9260.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9260.dts
@@ -16,10 +16,6 @@ chosen {
 		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
 	};
 
-	memory@20000000 {
-		reg = <0x20000000 0x4000000>;
-	};
-
 	ahb {
 		apb {
 			shdwc: poweroff@fffffd10 {
diff --git a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
index 8c3530638c6d..b094c31033b5 100644
--- a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
+++ b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
@@ -16,6 +16,10 @@ main_xtal {
 		};
 	};
 
+	memory@20000000 {
+		reg = <0x20000000 0x4000000>;
+	};
+
 	ahb {
 		apb {
 			dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
index f1946e0996b7..b11ad0b29026 100644
--- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
+++ b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
@@ -14,10 +14,6 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory@20000000 {
-		reg = <0x20000000 0x4000000>;
-	};
-
 	i2c-gpio-0 {
 		rtc@56 {
 			compatible = "microcrystal,rv3029";
-- 
2.47.2

[PATCH 2/4] ARM: dts: at91: usb_a9260: use 'stdout-path'

[Wolfram Sang]

Do not use the kernel command line for specifying the default serial
console.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/microchip/usb_a9260.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts
index de19904e9e91..1de2864b4cf6 100644
--- a/arch/arm/boot/dts/microchip/usb_a9260.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9260.dts
@@ -13,7 +13,8 @@ / {
 	compatible = "calao,usb-a9260", "atmel,at91sam9260", "atmel,at91sam9";
 
 	chosen {
-		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
+		bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
+		stdout-path = "serial0:115200n8";
 	};
 
 	ahb {
-- 
2.47.2

[PATCH 3/4] ARM: dts: at91: calao_usb: simplify chosen node

[Wolfram Sang]

All devices use equal parameters in 'chosen'. So, the memory node can
bet put into the most generic DTSI.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/microchip/usb_a9260.dts         | 5 -----
 arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 5 +++++
 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts
index 1de2864b4cf6..3b61e7145060 100644
--- a/arch/arm/boot/dts/microchip/usb_a9260.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9260.dts
@@ -12,11 +12,6 @@ / {
 	model = "Calao USB A9260";
 	compatible = "calao,usb-a9260", "atmel,at91sam9260", "atmel,at91sam9";
 
-	chosen {
-		bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
-		stdout-path = "serial0:115200n8";
-	};
-
 	ahb {
 		apb {
 			shdwc: poweroff@fffffd10 {
diff --git a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
index b094c31033b5..da32c5fdcc47 100644
--- a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
+++ b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
@@ -6,6 +6,11 @@
  */
 
 / {
+	chosen {
+		bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
+		stdout-path = "serial0:115200n8";
+	};
+
 	clocks {
 		slow_xtal {
 			clock-frequency = <32768>;
diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
index b11ad0b29026..6bc307c91d65 100644
--- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
+++ b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
@@ -9,11 +9,6 @@
 #include "usb_a9260_common.dtsi"
 
 / {
-	chosen {
-		bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
-		stdout-path = "serial0:115200n8";
-	};
-
 	i2c-gpio-0 {
 		rtc@56 {
 			compatible = "microcrystal,rv3029";
-- 
2.47.2

[PATCH 4/4] ARM: dts: at91: usb_a9g20: move wrong RTC node

[Wolfram Sang]

Only the LPW variant has the external RTC. Move it to that board
specific DT. As a result, the common include for A9G20 boards can
go now.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/microchip/usb_a9g20.dts      |  3 ++-
 .../boot/dts/microchip/usb_a9g20_common.dtsi   | 18 ------------------
 arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts  | 10 +++++++++-
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi

diff --git a/arch/arm/boot/dts/microchip/usb_a9g20.dts b/arch/arm/boot/dts/microchip/usb_a9g20.dts
index a2f748141d4b..bdaf35c6526e 100644
--- a/arch/arm/boot/dts/microchip/usb_a9g20.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9g20.dts
@@ -5,7 +5,8 @@
  *  Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 /dts-v1/;
-#include "usb_a9g20_common.dtsi"
+#include "at91sam9g20.dtsi"
+#include "usb_a9260_common.dtsi"
 
 / {
 	model = "Calao USB A9G20";
diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
deleted file mode 100644
index 6bc307c91d65..000000000000
--- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * usb_a9g20.dts - Device Tree file for Calao USB A9G20 board
- *
- *  Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- */
-
-#include "at91sam9g20.dtsi"
-#include "usb_a9260_common.dtsi"
-
-/ {
-	i2c-gpio-0 {
-		rtc@56 {
-			compatible = "microcrystal,rv3029";
-			reg = <0x56>;
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts b/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts
index 4d104797176c..2eda00477bc5 100644
--- a/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts
@@ -5,7 +5,8 @@
  *  Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 /dts-v1/;
-#include "usb_a9g20_common.dtsi"
+#include "at91sam9g20.dtsi"
+#include "usb_a9260_common.dtsi"
 
 / {
 	model = "Calao USB A9G20 Low Power";
@@ -27,4 +28,11 @@ mmc@0 {
 			};
 		};
 	};
+
+	i2c-gpio-0 {
+		rtc@56 {
+			compatible = "microcrystal,rv3029";
+			reg = <0x56>;
+		};
+	};
 };
-- 
2.47.2

Re: [PATCH 0/4] ARM: dts: at91: calao_usb: clean up and remove usb_a9g20_common.dtsi

[Alexandre Belloni]

On 02/04/2025 22:48:50+0200, Wolfram Sang wrote:
> My USB-A9G20 definitely has no external RTC, unlike the LPW version.
> While fixing that, I noticed that this renders the whole a9g20 include
> obsolete. Here is a complete series doing that.
> 
> 
> Wolfram Sang (4):
>   ARM: dts: at91: calao_usb: simplify memory node
>   ARM: dts: at91: usb_a9260: use 'stdout-path'
>   ARM: dts: at91: calao_usb: simplify chosen node
>   ARM: dts: at91: usb_a9g20: move wrong RTC node
> 

Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

>  arch/arm/boot/dts/microchip/usb_a9260.dts     |  8 ------
>  .../boot/dts/microchip/usb_a9260_common.dtsi  |  9 +++++++
>  arch/arm/boot/dts/microchip/usb_a9g20.dts     |  3 ++-
>  .../boot/dts/microchip/usb_a9g20_common.dtsi  | 27 -------------------
>  arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts | 10 ++++++-
>  5 files changed, 20 insertions(+), 37 deletions(-)
>  delete mode 100644 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi
> 
> -- 
> 2.47.2
> 

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 0/4] ARM: dts: at91: calao_usb: clean up and remove usb_a9g20_common.dtsi

[Claudiu Beznea]

On 02.04.2025 23:48, Wolfram Sang wrote:
> Wolfram Sang (4):
>   ARM: dts: at91: calao_usb: simplify memory node
>   ARM: dts: at91: usb_a9260: use 'stdout-path'
>   ARM: dts: at91: calao_usb: simplify chosen node
>   ARM: dts: at91: usb_a9g20: move wrong RTC node

Applied to at91-dt, thanks!