diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 23:52:40 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 23:52:40 +0300 |
| commit | 0d639e0a65af84a2cf636f1aaa7775131931356f (patch) | |
| tree | 9ab44bc524fa4b7d586cd4a92c3600e0a3c970c8 /arch/arm/boot/dts/r8a7791-porter.dts | |
| parent | 8eb1f10ee94abc4d6cd4bd4a3e4f240ec0054ba8 (diff) | |
| parent | d01c8bec91414f2110370dfcb9dd33fc0e573cee (diff) | |
| download | linux-0d639e0a65af84a2cf636f1aaa7775131931356f.tar.xz | |
Merge tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Third Round of Renesas ARM Based SoC DT Updates for v4.5
* Use SoC-specific usb-dmac and IPMMU compatibility strings
* Add internal delay for i2c IPs
* Add missing serial devices to r8a7793
* Enable DMA for r8a7793 serial devices
* Add serial port config to chosen/stdout-path
* Tidyup #sound-dai-cells settings for r8a7798/bockw
* Remove deprecated #gpio-range-cells from r8a7793
* Add EtherAVB support to r8a7791
* Add MSIOF support to sh73a0
* tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits)
ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7793: Describe DMA for the serial ports
ARM: shmobile: r8a7793: Add missing serial devices to DT
ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
ARM: shmobile: bockw dts: Update console parameters
ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/r8a7791-porter.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-porter.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts index f2dd5356eac8..71ba7b6b3a33 100644 --- a/arch/arm/boot/dts/r8a7791-porter.dts +++ b/arch/arm/boot/dts/r8a7791-porter.dts @@ -22,7 +22,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif0; + stdout-path = "serial0:115200n8"; }; memory@40000000 { |