Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef228e3 authored by Ray Jui's avatar Ray Jui Committed by Florian Fainelli
Browse files

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: default avatarRay Jui <rjui@broadcom.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 08668d9d

arch/arm/boot/dts/bcm-cygnus.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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";

	};

};