diff options
| author | Ray Jui <rjui@broadcom.com> | 2015-09-25 00:21:23 +0200 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2015-09-25 03:30:10 +0200 |
| commit | eef228e3191de0b62ef5913be216f25ba6b23a4c (patch) | |
| tree | 9ab11f6d4057d993074144fd1d29df35127c79e5 /arch/arm | |
| parent | ARM: dts: fix Cygnus nand device node (diff) | |
| download | linux-eef228e3191de0b62ef5913be216f25ba6b23a4c.tar.xz linux-eef228e3191de0b62ef5913be216f25ba6b23a4c.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/bcm-cygnus.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm911360k.dts | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm958300k.dts | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm958305k.dts | 7 |
4 files changed, 15 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index b5f9f34183fe..2778533502d9 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -41,10 +41,6 @@ model = "Broadcom Cygnus SoC"; interrupt-parent = <&gic>; - aliases { - serial0 = &uart3; - }; - cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts index 814011c331d0..091c73a46e08 100644 --- a/arch/arm/boot/dts/bcm911360k.dts +++ b/arch/arm/boot/dts/bcm911360k.dts @@ -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"; }; }; diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts index 2e31581dc25e..b4a1392bd5a6 100644 --- a/arch/arm/boot/dts/bcm958300k.dts +++ b/arch/arm/boot/dts/bcm958300k.dts @@ -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"; }; }; diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts index 288a637abf3b..3378683321d3 100644 --- a/arch/arm/boot/dts/bcm958305k.dts +++ b/arch/arm/boot/dts/bcm958305k.dts @@ -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"; }; }; |