Skip to content

Commit 3984cc0

Browse files
Wolfram Sangclaudiubeznea
authored andcommitted
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 <[email protected]> Reviewed-by: Alexandre Belloni <[email protected]> Link: https://lore.kernel.org/r/[email protected] [claudiu.beznea: s/can bet put/can be put/g in commit description] Signed-off-by: Claudiu Beznea <[email protected]>
1 parent 1477dd9 commit 3984cc0

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

arch/arm/boot/dts/microchip/usb_a9260.dts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
model = "Calao USB A9260";
1313
compatible = "calao,usb-a9260", "atmel,at91sam9260", "atmel,at91sam9";
1414

15-
chosen {
16-
bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
17-
stdout-path = "serial0:115200n8";
18-
};
19-
2015
ahb {
2116
apb {
2217
shdwc: poweroff@fffffd10 {

arch/arm/boot/dts/microchip/usb_a9260_common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
*/
77

88
/ {
9+
chosen {
10+
bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
11+
stdout-path = "serial0:115200n8";
12+
};
13+
914
clocks {
1015
slow_xtal {
1116
clock-frequency = <32768>;

arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
#include "usb_a9260_common.dtsi"
1010

1111
/ {
12-
chosen {
13-
bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
14-
stdout-path = "serial0:115200n8";
15-
};
16-
1712
i2c-gpio-0 {
1813
rtc@56 {
1914
compatible = "microcrystal,rv3029";

0 commit comments

Comments
 (0)