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

Commit de192ef1 authored Sep 21, 2015 by Ray Jui Committed by Florian Fainelli Sep 22, 2015

ARM: dts: consolidate aliases for Cygnus dt files



Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts
files

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

parent 6c8c58b3

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,10 @@
	model = "Broadcom Cygnus SoC";		model = "Broadcom Cygnus SoC";
	interrupt-parent = <&gic>;		interrupt-parent = <&gic>;

			aliases {
			serial0 = &uart3;
			};

	cpus {		cpus {
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;

arch/arm/boot/dts/bcm911360_entphn.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -39,10 +39,6 @@
	model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)";		model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)";
	compatible = "brcm,bcm11360", "brcm,cygnus";		compatible = "brcm,bcm11360", "brcm,cygnus";

	aliases {
	serial0 = &uart3;
	};

	chosen {		chosen {
	stdout-path = &uart3;		stdout-path = &uart3;
	bootargs = "console=ttyS0,115200";		bootargs = "console=ttyS0,115200";

arch/arm/boot/dts/bcm911360k.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,10 +38,6 @@
	model = "Cygnus SVK (BCM911360K)";		model = "Cygnus SVK (BCM911360K)";
	compatible = "brcm,bcm11360", "brcm,cygnus";		compatible = "brcm,bcm11360", "brcm,cygnus";

	aliases {
	serial0 = &uart3;
	};

	chosen {		chosen {
	stdout-path = &uart3;		stdout-path = &uart3;
	bootargs = "console=ttyS0,115200";		bootargs = "console=ttyS0,115200";

arch/arm/boot/dts/bcm958300k.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,10 +38,6 @@
	model = "Cygnus SVK (BCM958300K)";		model = "Cygnus SVK (BCM958300K)";
	compatible = "brcm,bcm58300", "brcm,cygnus";		compatible = "brcm,bcm58300", "brcm,cygnus";

	aliases {
	serial0 = &uart3;
	};

	chosen {		chosen {
	stdout-path = &uart3;		stdout-path = &uart3;
	bootargs = "console=ttyS0,115200";		bootargs = "console=ttyS0,115200";

arch/arm/boot/dts/bcm958305k.dts

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,10 +38,6 @@
	model = "Cygnus Wireless Audio (BCM958305K)";		model = "Cygnus Wireless Audio (BCM958305K)";
	compatible = "brcm,bcm58305", "brcm,cygnus";		compatible = "brcm,bcm58305", "brcm,cygnus";

	aliases {
	serial0 = &uart3;
	};

	chosen {		chosen {
	stdout-path = &uart3;		stdout-path = &uart3;
	bootargs = "console=ttyS0,115200";		bootargs = "console=ttyS0,115200";