ARM: dts: broadcom: bcm21664: Move chosen node into Garnet DTS

The serial console settings in the chosen node are device-specific,
not SoC-specific. Move the chosen node out of bcm21664.dtsi and into
the only DTS that uses it, bcm21664-garnet.dts.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://lore.kernel.org/r/20240729-bcm21664-common-v2-1-ebc21a89bf63@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts b/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts
index 8789fae178bf80b8d1ee9c1074f725271935db23..4f8ddc1b3ab7b45768124b74483a81c76c7e1a5d 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts
+++ b/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts
@@ -11,6 +11,10 @@
        model = "BCM21664 Garnet board";
        compatible = "brcm,bcm21664-garnet", "brcm,bcm21664";
 
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
        memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */

diff --git a/arch/arm/boot/dts/broadcom/bcm21664.dtsi b/arch/arm/boot/dts/broadcom/bcm21664.dtsi
index fa73600e883e70895defa730683db72f8118f90b..c1ad5123bad474e5a855a6a35c97d19695057607 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm21664.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm21664.dtsi
@@ -12,10 +12,6 @@
        compatible = "brcm,bcm21664";
        interrupt-parent = <&gic>;
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;