diff options
author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2012-10-24 01:48:00 -0400 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2012-10-30 03:25:53 -0400 |
commit | 0ce53cdc5c7e28f378e480363a0b0c2ed7e7eaf9 (patch) | |
tree | d830707164f4d997c548c78bad9ed440f369d8a2 /arch/arm/mach-shmobile | |
parent | b82573e18bc61666ffd3901ca6677bf18b9ea743 (diff) |
ARM: mach-shmobile: Use DT_MACHINE for mackerel
Use DT_MACHINE_START() on the sh7372 based mackerel board.
Also include a tiny DTS file to describe the board and update the
Kconfig dependencies to select CONFIG_USE_OF.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 8ae100cc655c..0750d9c7f00d 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -95,6 +95,7 @@ config MACH_MACKEREL | |||
95 | select ARCH_REQUIRE_GPIOLIB | 95 | select ARCH_REQUIRE_GPIOLIB |
96 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 96 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
97 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | 97 | select SND_SOC_AK4642 if SND_SIMPLE_CARD |
98 | select USE_OF | ||
98 | 99 | ||
99 | config MACH_KOTA2 | 100 | config MACH_KOTA2 |
100 | bool "KOTA2 board" | 101 | bool "KOTA2 board" |
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) | |||
1651 | pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); | 1651 | pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); |
1652 | } | 1652 | } |
1653 | 1653 | ||
1654 | MACHINE_START(MACKEREL, "mackerel") | 1654 | static const char *mackerel_boards_compat_dt[] __initdata = { |
1655 | "renesas,mackerel", | ||
1656 | NULL, | ||
1657 | }; | ||
1658 | |||
1659 | DT_MACHINE_START(MACKEREL_DT, "mackerel") | ||
1655 | .map_io = sh7372_map_io, | 1660 | .map_io = sh7372_map_io, |
1656 | .init_early = sh7372_add_early_devices, | 1661 | .init_early = sh7372_add_early_devices, |
1657 | .init_irq = sh7372_init_irq, | 1662 | .init_irq = sh7372_init_irq, |
@@ -1659,4 +1664,5 @@ MACHINE_START(MACKEREL, "mackerel") | |||
1659 | .init_machine = mackerel_init, | 1664 | .init_machine = mackerel_init, |
1660 | .init_late = sh7372_pm_init_late, | 1665 | .init_late = sh7372_pm_init_late, |
1661 | .timer = &shmobile_timer, | 1666 | .timer = &shmobile_timer, |
1667 | .dt_compat = mackerel_boards_compat_dt, | ||
1662 | MACHINE_END | 1668 | MACHINE_END |