diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-10-29 20:54:13 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-10-29 20:54:13 -0400 |
| commit | 4df49d9e1f2592338b5e8d0b5ce9f2485e295cc0 (patch) | |
| tree | 8f895dbc4217690a06a278a6322db244d20ada94 /arch/arm/boot/dts/r8a7791-koelsch.dts | |
| parent | 0ee56d403549fd97d8acac6b7ba3a17f6999c30a (diff) | |
| parent | fd3edcbe9f7bf24b13cadca7616f8e10bbe7e2b3 (diff) | |
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/r8a7791-koelsch.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 4f4e56e5de3d..5e4d833ae491 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | chosen { | 27 | chosen { |
| 28 | bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; | 28 | bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; |
| 29 | stdout-path = &scif0; | ||
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | memory@40000000 { | 32 | memory@40000000 { |