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/r8a73a4-ape6evm-reference.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/r8a73a4-ape6evm-reference.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index a860f32bca2..84e05f713c5 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -21,7 +21,8 @@ }; chosen { - bootargs = "console=ttySC0,115200 ignore_loglevel rw"; + bootargs = "ignore_loglevel rw"; + stdout-path = &scifa0; }; memory@40000000 { @@ -93,6 +94,10 @@ voltage-tolerance = <1>; /* 1% */ }; +&cmt1 { + status = "okay"; +}; + &pfc { scifa0_pins: serial0 { renesas,groups = "scifa0_data"; |