diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2015-08-07 11:45:33 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-09-14 10:16:36 +0900 |
| commit | 8025e3ff4ca972a0ca2aa898562670a767f79889 (patch) | |
| tree | 51f10d271702177a5624ff15cff345d3cdf083e2 /arch/arm/boot/dts/r8a7779-marzen.dts | |
| parent | 0ebdbc505b620ab4397c3105d36a5383fb16b151 (diff) | |
ARM: shmobile: marzen: Board specific serial port order
Convert Marzen to use board-specific serial0 and serial1 instead
of the older shared SoC-specific SCIF index.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/r8a7779-marzen.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7779-marzen.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index 20afea6f06ef..fe396c8d58db 100644 --- a/arch/arm/boot/dts/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/r8a7779-marzen.dts @@ -19,12 +19,12 @@ compatible = "renesas,marzen", "renesas,r8a7779"; aliases { - serial2 = &scif2; - serial4 = &scif4; + serial0 = &scif2; + serial1 = &scif4; }; chosen { - bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on"; + bootargs = "ignore_loglevel root=/dev/nfs ip=on"; stdout-path = &scif2; }; |