forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: mach-shmobile: Use DT_MACHINE for mackerel

Browse source 
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>
This commit is contained in:
Nobuhiro Iwamatsu 2012-10-24 14:48:00 +09:00 • committed by Simon Horman
commit 0ce53cdc5c
4 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/boot/dts/Makefile
View file

@ -75,7 +75,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
r8a7740-armadillo800eva.dtb \ r8a7740-armadillo800eva.dtb \
sh73a0-kzm9g.dtb sh73a0-kzm9g.dtb \
sh7372-mackerel.dtb
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
spear1340-evb.dtb spear1340-evb.dtb
dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

22
arch/arm/boot/dts/sh7372-mackerel.dts Normal file
View file

@ -0,0 +1,22 @@
/*
* Device Tree Source for the mackerel board
*
* Copyright (C) 2012 Renesas Solutions Corp.
*
* This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied.
*/
/dts-v1/;
/include/ "skeleton.dtsi"
/ {
model = "Mackerel (AP4 EVM 2nd)";
compatible = "renesas,mackerel";
memory {
device_type = "memory";
reg = <0x40000000 0x10000000>;
};
};

1
arch/arm/mach-shmobile/Kconfig
View file

@ -95,6 +95,7 @@ config MACH_MACKEREL
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
select SND_SOC_AK4642 if SND_SIMPLE_CARD select SND_SOC_AK4642 if SND_SIMPLE_CARD
select USE_OF
config MACH_KOTA2 config MACH_KOTA2
bool "KOTA2 board" bool "KOTA2 board"

8
arch/arm/mach-shmobile/board-mackerel.c
View file

@ -1651,7 +1651,12 @@ static void __init mackerel_init(void)
pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); 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, .map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices, .init_early = sh7372_add_early_devices,
.init_irq = sh7372_init_irq, .init_irq = sh7372_init_irq,
@ -1659,4 +1664,5 @@ MACHINE_START(MACKEREL, "mackerel")
.init_machine = mackerel_init, .init_machine = mackerel_init,
.init_late = sh7372_pm_init_late, .init_late = sh7372_pm_init_late,
.timer = &shmobile_timer, .timer = &shmobile_timer,
.dt_compat = mackerel_boards_compat_dt,
MACHINE_END MACHINE_END