diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:09:12 +0200 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 23:19:22 +0400 |
| commit | b155f49f99013f97367dd500771a89d6e01573c1 (patch) | |
| tree | 08eefe2a6a6c074d009d9b0b5fd2a1180dcc7da1 | |
| parent | 924374e93b4fc8b81256afff8b2cf7dddfcc8841 (diff) | |
| download | vexpress-lsk-b155f49f99013f97367dd500771a89d6e01573c1.tar.gz | |
arm/dt: vexpress: add basic DT platform matching support
This patch adds a DT match table to the Versatile Express machine
description in order to enable basic device tree support.
Tested on a Versatile Express board where the device tree blob is
passed to the kernel by u-boot.
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
[converted .dts file to use skeleton.dtsi, and added 'dtbs' targets]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | arch/arm/boot/dts/vexpress.dts | 10 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/Makefile.boot | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vexpress.dts b/arch/arm/boot/dts/vexpress.dts new file mode 100644 index 00000000000..5f3bc1d1f1c --- /dev/null +++ b/arch/arm/boot/dts/vexpress.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/include/ "skeleton.dtsi" + +/ { + model = "ARM Versatile Express"; + compatible = "arm,vexpress"; + memory { + reg = <0x60000000 0x40000000>; + }; +}; diff --git a/arch/arm/mach-vexpress/Makefile.boot b/arch/arm/mach-vexpress/Makefile.boot index 8630b3d10a4..27f47b75a89 100644 --- a/arch/arm/mach-vexpress/Makefile.boot +++ b/arch/arm/mach-vexpress/Makefile.boot @@ -1,3 +1,5 @@ zreladdr-y += 0x60008000 params_phys-y := 0x60000100 initrd_phys-y := 0x60800000 + +dtb-$(CONFIG_ARCH_VEXPRESS_CA9X4) += vexpress.dtb diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 7aa07a8ce23..d44f542ab8a 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -443,6 +443,11 @@ static void __init v2m_init(void) ct_desc->init_tile(); } +static const char *vexpress_dt_match[] __initdata = { + "arm,vexpress", + NULL, +}; + MACHINE_START(VEXPRESS, "ARM-Versatile Express") .atag_offset = 0x100, .map_io = v2m_map_io, @@ -451,4 +456,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") .timer = &v2m_timer, .handle_irq = gic_handle_irq, .init_machine = v2m_init, + .dt_compat = vexpress_dt_match, MACHINE_END |