diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-10-30 09:54:13 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-10-30 09:54:13 +0900 |
| commit | 4df49d9e1f2592338b5e8d0b5ce9f2485e295cc0 (patch) | |
| tree | 8f895dbc4217690a06a278a6322db244d20ada94 /arch/arm/boot/dts/r8a7779-marzen.dts | |
| parent | 0ee56d403549fd97d8acac6b7ba3a17f6999c30a (diff) | |
| parent | fd3edcbe9f7bf24b13cadca7616f8e10bbe7e2b3 (diff) | |
| download | talos-op-linux-4df49d9e1f2592338b5e8d0b5ce9f2485e295cc0.tar.gz talos-op-linux-4df49d9e1f2592338b5e8d0b5ce9f2485e295cc0.zip | |
Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' into dt-for-v3.19.base
Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
* Initialise CMT1 timer using DT
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 { |
