iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree

Browse Source 
Based on work by Magnus Damm

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Simon Horman 2014-08-12 09:04:39 +09:00
parent c10df265fe
commit 1145eaabcf
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
View File

@ -191,6 +191,10 @@
renesas,mode = <0x05>; /* MD_CK0 | MD_CK2 */ renesas,mode = <0x05>; /* MD_CK0 | MD_CK2 */
}; };
&cmt1 {
status = "ok";
};
&i2c0 { &i2c0 {
status = "okay"; status = "okay";
touchscreen@55 { touchscreen@55 {

11
arch/arm/mach-shmobile/setup-r8a7740.c
View File

@ -311,10 +311,6 @@ static struct platform_device ipmmu_device = {
.num_resources = ARRAY_SIZE(ipmmu_resources), .num_resources = ARRAY_SIZE(ipmmu_resources),
}; };
static struct platform_device *r8a7740_devices_dt[] __initdata = {
&cmt1_device,
};
static struct platform_device *r8a7740_early_devices[] __initdata = { static struct platform_device *r8a7740_early_devices[] __initdata = {
&scif0_device, &scif0_device,
&scif1_device, &scif1_device,
@ -331,6 +327,7 @@ static struct platform_device *r8a7740_early_devices[] __initdata = {
&irqpin3_device, &irqpin3_device,
&tmu0_device, &tmu0_device,
&ipmmu_device, &ipmmu_device,
&cmt1_device,
}; };
/* DMA */ /* DMA */
@ -756,8 +753,6 @@ void __init r8a7740_add_standard_devices(void)
/* add devices */ /* add devices */
platform_add_devices(r8a7740_early_devices, platform_add_devices(r8a7740_early_devices,
ARRAY_SIZE(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, platform_add_devices(r8a7740_late_devices,
ARRAY_SIZE(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, early_platform_add_devices(r8a7740_early_devices,
ARRAY_SIZE(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 */ /* setup early console here as well */
shmobile_setup_console(); shmobile_setup_console();
@ -790,8 +783,6 @@ void __init r8a7740_add_early_devices(void)
void __init r8a7740_add_standard_devices_dt(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); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }