diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 08:30:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 08:30:24 +0100 |
| commit | 21220a7a32c907d620ab60098c7da5bfdba24c13 (patch) | |
| tree | ec01b27e69da3ad8737dc047642798bb9d0e10fc /arch/arm/boot/dts/r8a7779-marzen.dts | |
| parent | ARM: at91: remove useless init_time for DT-only SoCs (diff) | |
| parent | ARM: shmobile: kzm9d dts: Add chosen/stdout-path (diff) | |
| download | linux-21220a7a32c907d620ab60098c7da5bfdba24c13.tar.xz linux-21220a7a32c907d620ab60098c7da5bfdba24c13.zip | |
Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Pull "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:
* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
- The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile
* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9d dts: Add chosen/stdout-path
ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
ARM: shmobile: alt dts: Add chosen/stdout-path
ARM: shmobile: koelsch dts: Add chosen/stdout-path
ARM: shmobile: henninger dts: Add chosen/stdout-path
ARM: shmobile: lager dts: Add chosen/stdout-path
ARM: shmobile: marzen dts: Add chosen/stdout-path
ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
ARM: shmobile: genmai dts: Add chosen/stdout-path
ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
ARM: shmobile: emev2 dtsi: Use generic names for device nodes
ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
ARM: shmobile: r8a73a4: sort dtsi file by address
ARM: shmobile: kzm9d: sort dts file by address
ARM: shmobile: r7s72100: sort dtsi file by address
ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
ARM: dts: Sort SHMOBILE dtbs alphabetically
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/r8a7779-marzen.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7779-marzen.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index 765978fe430b..e83d40e24bcd 100644 --- a/arch/arm/boot/dts/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/r8a7779-marzen.dts @@ -25,6 +25,7 @@ chosen { bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on"; + stdout-path = &scif2; }; memory { |