| Message ID | 20250402204856.5197-4-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: at91: calao_usb: clean up and remove usb_a9g20_common.dtsi | expand |
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";
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(-)