diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:25:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:25:07 +0200 |
| commit | 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f (patch) | |
| tree | 046e979630dcc8f51347168c9841b60a0d94467e /arch/arm/mach-shmobile | |
| parent | 3c437430f1493b77f5fd3cbc1473b7bdc9686b91 (diff) | |
| parent | 7296d93201710865233fbebf7c9853d2f95d7716 (diff) | |
| download | linux-4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f.tar.gz linux-4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f.tar.bz2 linux-4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f.zip | |
Merge branch 'renesas-kzm9g' into renesas-board-new
* renesas-kzm9g:
ARM: mach-shmobile: Use DT_MACHINE for KZM9G
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 8 |
2 files changed, 8 insertions, 1 deletions
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 bool "KZM-A9-GT board" depends on ARCH_SH73A0 select ARCH_REQUIRE_GPIOLIB + select USE_OF comment "SH-Mobile System Configuration" 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) platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); } -MACHINE_START(KZM9G, "kzm9g") +static const char *kzm9g_boards_compat_dt[] __initdata = { + "renesas,kzm9g", + NULL, +}; + +DT_MACHINE_START(KZM9G_DT, "kzm9g") .map_io = sh73a0_map_io, .init_early = sh73a0_add_early_devices, .nr_irqs = NR_IRQS_LEGACY, @@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g") .handle_irq = gic_handle_irq, .init_machine = kzm_init, .timer = &shmobile_timer, + .dt_compat = kzm9g_boards_compat_dt, MACHINE_END |