diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-08-12 04:04:39 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-08-23 14:57:44 +0400 |
| commit | 1145eaabcf1d108993b5c7bea3d86bbef7143135 (patch) | |
| tree | 5a984ad5d9eb37680daad857ae7069d424d9b7a7 /arch/arm | |
| parent | c10df265febc7e46a60b129756915ad1d4d13e27 (diff) | |
| download | linux-1145eaabcf1d108993b5c7bea3d86bbef7143135.tar.xz | |
ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree
Based on work by Magnus Damm
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7740.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 266c4394a3fe..5e646e60f1b3 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -191,6 +191,10 @@ renesas,mode = <0x05>; /* MD_CK0 | MD_CK2 */ }; +&cmt1 { + status = "ok"; +}; + &i2c0 { status = "okay"; touchscreen@55 { diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 3d5eacaba3e6..dc44a44247e4 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -311,10 +311,6 @@ static struct platform_device ipmmu_device = { .num_resources = ARRAY_SIZE(ipmmu_resources), }; -static struct platform_device *r8a7740_devices_dt[] __initdata = { - &cmt1_device, -}; - static struct platform_device *r8a7740_early_devices[] __initdata = { &scif0_device, &scif1_device, @@ -331,6 +327,7 @@ static struct platform_device *r8a7740_early_devices[] __initdata = { &irqpin3_device, &tmu0_device, &ipmmu_device, + &cmt1_device, }; /* DMA */ @@ -756,8 +753,6 @@ void __init r8a7740_add_standard_devices(void) /* add devices */ platform_add_devices(r8a7740_early_devices, ARRAY_SIZE(r8a7740_early_devices)); - platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); platform_add_devices(r8a7740_late_devices, ARRAY_SIZE(r8a7740_late_devices)); @@ -779,8 +774,6 @@ void __init r8a7740_add_early_devices(void) { early_platform_add_devices(r8a7740_early_devices, ARRAY_SIZE(r8a7740_early_devices)); - early_platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); /* setup early console here as well */ shmobile_setup_console(); @@ -790,8 +783,6 @@ void __init r8a7740_add_early_devices(void) void __init r8a7740_add_standard_devices_dt(void) { - platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } |