summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2025-04-02 22:48:53 +0200
committerClaudiu Beznea <claudiu.beznea@tuxon.dev>2025-04-11 10:39:35 +0300
commit3984cc0f79f5c03b65f3581f48c04cb5e1445c4b (patch)
tree4e7ba4b0c3cf978e9d1845888505024b1ff2f8b2
parent1477dd96e959c1a54546583fb395f0e4ed97d76a (diff)
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>
-rw-r--r--arch/arm/boot/dts/microchip/usb_a9260.dts5
-rw-r--r--arch/arm/boot/dts/microchip/usb_a9260_common.dtsi5
-rw-r--r--arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi5
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";