diff options
| author | Artur Weber <aweber.kernel@gmail.com> | 2024-07-29 14:34:20 +0200 |
|---|---|---|
| committer | Florian Fainelli <florian.fainelli@broadcom.com> | 2024-07-29 14:59:17 -0700 |
| commit | 19c48f2789b0f90bc9270ddef4fffe9fd26e8dec (patch) | |
| tree | b91360ffef92017e8d331f3fb861023e6d5a4da7 | |
| parent | ed0d78c75ca93c9f1d7f0d08ac5abe0de71fe312 (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm21664-garnet.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm21664.dtsi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts b/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts index 8789fae178bf..4f8ddc1b3ab7 100644 --- 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 fa73600e883e..c1ad5123bad4 100644 --- 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>; |