ARM: dts: move aliases back to .dts in Cygnus
Subsystems (2)
Ray Jui
maintainerPATCH 1/1 ARM: dts: move aliases back to .dts in Cygnus
Move aliases from bcm-cygnus.dtsi back to individual .dts files. Also clean up the chosen node to have the stdout-path using the proper alias
Signed-off-by Ray Jui <[email protected]>
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ---- arch/arm/boot/dts/bcm911360k.dts | 7 +++++-- arch/arm/boot/dts/bcm958300k.dts | 7 +++++-- arch/arm/boot/dts/bcm958305k.dts | 7 +++++-- 4 files changed, 15 insertions(+), 10 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +0 -4
@@ -41,10 +41,6 @@ model = "Broadcom Cygnus SoC"; interrupt-parent = <&gic>; - aliases { - serial0 = &uart3; - }; - cpus { #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/bcm911360k.dts +5 -2
@@ -38,9 +38,12 @@ model = "Cygnus SVK (BCM911360K)"; compatible = "brcm,bcm11360", "brcm,cygnus"; + aliases { + serial0 = &uart3; + }; + chosen { - stdout-path = &uart3; - bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; };
arch/arm/boot/dts/bcm958300k.dts +5 -2
@@ -39,9 +39,12 @@ model = "Cygnus SVK (BCM958300K)"; compatible = "brcm,bcm58300", "brcm,cygnus"; + aliases { + serial0 = &uart3; + }; + chosen { - stdout-path = &uart3; - bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; };
arch/arm/boot/dts/bcm958305k.dts +5 -2
@@ -39,9 +39,12 @@ model = "Cygnus Wireless Audio (BCM958305K)"; compatible = "brcm,bcm58305", "brcm,cygnus"; + aliases { + serial0 = &uart3; + }; + chosen { - stdout-path = &uart3; - bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; };
Signature · 1 line
1.9.1
Florian Fainelli
AppliedQuoted 4 lines · Ray Jui
Move aliases from
bcm-cygnus.dtsiback to individual .dts files. Also clean up the chosen node to have the stdout-path using the proper aliasSigned-off-by Ray Jui <[email protected]>
Applied to devicetree/next, thanks!
Signature · 1 line
Florian