diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
| commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch) | |
| tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm/mach-shmobile/setup-r8a73a4.c | |
| parent | ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file (diff) | |
| parent | ARM: shmobile: r8a7740: Add TPU node to the device tree (diff) | |
| download | linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.xz linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip | |
Merge branch 'dt2' into cleanup3-base
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a73a4.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a73a4.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c index 11c0f6305e6b..2ee45d5288b1 100644 --- a/arch/arm/mach-shmobile/setup-r8a73a4.c +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c @@ -188,7 +188,7 @@ static struct resource cmt10_resources[] = { &cmt##idx##_platform_data, \ sizeof(struct sh_timer_config)) -void __init r8a73a4_add_standard_devices(void) +void __init r8a73a4_add_dt_devices(void) { r8a73a4_register_scif(SCIFA0); r8a73a4_register_scif(SCIFA1); @@ -196,10 +196,15 @@ void __init r8a73a4_add_standard_devices(void) r8a73a4_register_scif(SCIFB1); r8a73a4_register_scif(SCIFB2); r8a73a4_register_scif(SCIFB3); + r8a7790_register_cmt(10); +} + +void __init r8a73a4_add_standard_devices(void) +{ + r8a73a4_add_dt_devices(); r8a73a4_register_irqc(0); r8a73a4_register_irqc(1); r8a73a4_register_thermal(); - r8a7790_register_cmt(10); } void __init r8a73a4_init_delay(void) |