diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-07-07 09:54:38 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-10-24 04:54:49 +0200 |
| commit | dfb846c95e3a7bb14f3aa61473aa4be0a8fe02ab (patch) | |
| tree | 218bd44c4ba3d0ab68275229a157fd135e8ffce5 /arch | |
| parent | ARM: shmobile: r8a73a4: Rename cmt registration helper (diff) | |
| download | linux-dfb846c95e3a7bb14f3aa61473aa4be0a8fe02ab.tar.xz linux-dfb846c95e3a7bb14f3aa61473aa4be0a8fe02ab.zip | |
ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
Initialise CMT1 device using DT when booting ape6evm
using DT-reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a73a4.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index 2bcf69124a6a..84e05f713c54 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -94,6 +94,10 @@ voltage-tolerance = <1>; /* 1% */ }; +&cmt1 { + status = "okay"; +}; + &pfc { scifa0_pins: serial0 { renesas,groups = "scifa0_data"; diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c index 7a7df71bbece..3b7efc04e2f5 100644 --- a/arch/arm/mach-shmobile/setup-r8a73a4.c +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c @@ -189,7 +189,6 @@ static struct resource cmt1_resources[] = { void __init r8a73a4_add_dt_devices(void) { - r8a73a4_register_cmt(1); } /* DMA */ @@ -282,7 +281,7 @@ static struct resource dma_resources[] = { void __init r8a73a4_add_standard_devices(void) { - r8a73a4_add_dt_devices(); + r8a73a4_register_cmt(1); r8a73a4_register_scif(0); r8a73a4_register_scif(1); r8a73a4_register_scif(2); |