diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 15:02:52 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 15:03:17 +0100 |
| commit | 94058fc593c7d309af112d3124ae0fbb6880d8ec (patch) | |
| tree | 9dc60e19ee52f2a133ef42451cf33ddade27e6fb /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | Linux 3.7-rc4 (diff) | |
| parent | ARM: shmobile: Remove G4EVM machine support (diff) | |
| download | linux-94058fc593c7d309af112d3124ae0fbb6880d8ec.tar.xz linux-94058fc593c7d309af112d3124ae0fbb6880d8ec.zip | |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Renesas board changes from Simon Horman:
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove G4EVM machine support
ARM: shmobile: Remove G3EVM machine support
ARM: mach-shmobile: Use DT_MACHINE for mackerel
ARM: shmobile: marzen: add HSPI support
ARM: shmobile: armadillo800eva: enable restart
ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
ARM: shmobile: kzm9g: enable magnetometer ak8975.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 0c27c810cf99..39b8f2e70638 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1651,7 +1651,12 @@ static void __init mackerel_init(void) pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); } -MACHINE_START(MACKEREL, "mackerel") +static const char *mackerel_boards_compat_dt[] __initdata = { + "renesas,mackerel", + NULL, +}; + +DT_MACHINE_START(MACKEREL_DT, "mackerel") .map_io = sh7372_map_io, .init_early = sh7372_add_early_devices, .init_irq = sh7372_init_irq, @@ -1659,4 +1664,5 @@ MACHINE_START(MACKEREL, "mackerel") .init_machine = mackerel_init, .init_late = sh7372_pm_init_late, .timer = &shmobile_timer, + .dt_compat = mackerel_boards_compat_dt, MACHINE_END |