Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <rjui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

authored by

Ray Jui and committed by
Florian Fainelli
eef228e3 08668d9d

+15 -10
-4
arch/arm/boot/dts/bcm-cygnus.dtsi
··· 41 41 model = "Broadcom Cygnus SoC"; 42 42 interrupt-parent = <&gic>; 43 43 44 - aliases { 45 - serial0 = &uart3; 46 - }; 47 - 48 44 cpus { 49 45 #address-cells = <1>; 50 46 #size-cells = <0>;
+5 -2
arch/arm/boot/dts/bcm911360k.dts
··· 38 38 model = "Cygnus SVK (BCM911360K)"; 39 39 compatible = "brcm,bcm11360", "brcm,cygnus"; 40 40 41 + aliases { 42 + serial0 = &uart3; 43 + }; 44 + 41 45 chosen { 42 - stdout-path = &uart3; 43 - bootargs = "console=ttyS0,115200"; 46 + stdout-path = "serial0:115200n8"; 44 47 }; 45 48 }; 46 49
+5 -2
arch/arm/boot/dts/bcm958300k.dts
··· 39 39 model = "Cygnus SVK (BCM958300K)"; 40 40 compatible = "brcm,bcm58300", "brcm,cygnus"; 41 41 42 + aliases { 43 + serial0 = &uart3; 44 + }; 45 + 42 46 chosen { 43 - stdout-path = &uart3; 44 - bootargs = "console=ttyS0,115200"; 47 + stdout-path = "serial0:115200n8"; 45 48 }; 46 49 }; 47 50
+5 -2
arch/arm/boot/dts/bcm958305k.dts
··· 39 39 model = "Cygnus Wireless Audio (BCM958305K)"; 40 40 compatible = "brcm,bcm58305", "brcm,cygnus"; 41 41 42 + aliases { 43 + serial0 = &uart3; 44 + }; 45 + 42 46 chosen { 43 - stdout-path = &uart3; 44 - bootargs = "console=ttyS0,115200"; 47 + stdout-path = "serial0:115200n8"; 45 48 }; 46 49 }; 47 50