ARM: dts: at91: calao_usb: simplify chosen node

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

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20250402204856.5197-4-wsa+renesas@sang-engineering.com
[claudiu.beznea: s/can bet put/can be put/g in commit description]
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>

diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts
index 1de2864b4cf613b897713d053026f7abd54d02dc..3b61e71450600439868236099be51555c2351c34 100644 (file)
--- 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 b094c31033b54372cb9c202f6d61a29b9e7b18d2..da32c5fdcc477b4bbf3f1d40706e64f3b04b3be0 100644 (file)
--- 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 b11ad0b29026612cec7881881f68bba3c6e0886a..6bc307c91d6593427c56ab9c0aba67b94acf7f71 100644 (file)
--- 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";