diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 17:25:07 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 17:25:07 -0400 |
commit | 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f (patch) | |
tree | 046e979630dcc8f51347168c9841b60a0d94467e /arch/arm | |
parent | 3c437430f1493b77f5fd3cbc1473b7bdc9686b91 (diff) | |
parent | 7296d93201710865233fbebf7c9853d2f95d7716 (diff) |
Merge branch 'renesas-kzm9g' into renesas-board-new
* renesas-kzm9g:
ARM: mach-shmobile: Use DT_MACHINE for KZM9G
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g.dts | 22 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 8 |
3 files changed, 30 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts new file mode 100644 index 000000000000..ed1bae5a24f1 --- /dev/null +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts | |||
@@ -0,0 +1,22 @@ | |||
1 | /* | ||
2 | * Device Tree Source for the KZM-A9-GT board | ||
3 | * | ||
4 | * Copyright (C) 2012 Renesas Solutions Corp. | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public License | ||
7 | * version 2. This program is licensed "as is" without any warranty of any | ||
8 | * kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | /dts-v1/; | ||
12 | /include/ "skeleton.dtsi" | ||
13 | |||
14 | / { | ||
15 | model = "KZM-A9-GT"; | ||
16 | compatible = "renesas,kzm9g"; | ||
17 | |||
18 | memory { | ||
19 | device_type = "memory"; | ||
20 | reg = <0x41000000 0x1e800000>; | ||
21 | }; | ||
22 | }; | ||
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 054f1a3a43cb..8e3602adabef 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -108,6 +108,7 @@ config MACH_KZM9G | |||
108 | bool "KZM-A9-GT board" | 108 | bool "KZM-A9-GT board" |
109 | depends on ARCH_SH73A0 | 109 | depends on ARCH_SH73A0 |
110 | select ARCH_REQUIRE_GPIOLIB | 110 | select ARCH_REQUIRE_GPIOLIB |
111 | select USE_OF | ||
111 | 112 | ||
112 | comment "SH-Mobile System Configuration" | 113 | comment "SH-Mobile System Configuration" |
113 | 114 | ||
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 78e9850967eb..d8e33b682832 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c | |||
@@ -443,7 +443,12 @@ static void __init kzm_init(void) | |||
443 | platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); | 443 | platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); |
444 | } | 444 | } |
445 | 445 | ||
446 | MACHINE_START(KZM9G, "kzm9g") | 446 | static const char *kzm9g_boards_compat_dt[] __initdata = { |
447 | "renesas,kzm9g", | ||
448 | NULL, | ||
449 | }; | ||
450 | |||
451 | DT_MACHINE_START(KZM9G_DT, "kzm9g") | ||
447 | .map_io = sh73a0_map_io, | 452 | .map_io = sh73a0_map_io, |
448 | .init_early = sh73a0_add_early_devices, | 453 | .init_early = sh73a0_add_early_devices, |
449 | .nr_irqs = NR_IRQS_LEGACY, | 454 | .nr_irqs = NR_IRQS_LEGACY, |
@@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g") | |||
451 | .handle_irq = gic_handle_irq, | 456 | .handle_irq = gic_handle_irq, |
452 | .init_machine = kzm_init, | 457 | .init_machine = kzm_init, |
453 | .timer = &shmobile_timer, | 458 | .timer = &shmobile_timer, |
459 | .dt_compat = kzm9g_boards_compat_dt, | ||
454 | MACHINE_END | 460 | MACHINE_END |