From cc3d7f70c37641ca417f4c02ecaf12cd9772ffa6 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 23 Apr 2013 14:51:11 +0000 Subject: xen: move the xenvm machine to mach-virt xenvm is based on mach-vexpress, move it to mach-virt. Changes in v4: - update the dts Makefile too. Signed-off-by: Stefano Stabellini CC: Marc Zyngier CC: will.deacon@arm.com CC: arnd@arndb.de CC: rob.herring@calxeda.com --- arch/arm/boot/dts/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts') diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9c62558..b6289b7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ vexpress-v2p-ca9.dtb \ vexpress-v2p-ca15-tc1.dtb \ - vexpress-v2p-ca15_a7.dtb \ - xenvm-4.2.dtb + vexpress-v2p-ca15_a7.dtb +dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ wm8505-ref.dtb \ wm8650-mid.dtb \ -- cgit v1.1 From d37a6e1687303ea0fcea89980373e3017b449963 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 24 Apr 2013 19:10:51 +0000 Subject: xenvm: add a simple PSCI node and a second cpu Signed-off-by: Stefano Stabellini Acked-by: Marc Zyngier CC: rob.herring@calxeda.com CC: will.deacon@arm.com CC: arnd@arndb.de --- arch/arm/boot/dts/xenvm-4.2.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'arch/arm/boot/dts') diff --git a/arch/arm/boot/dts/xenvm-4.2.dts b/arch/arm/boot/dts/xenvm-4.2.dts index ec3f952..3369151 100644 --- a/arch/arm/boot/dts/xenvm-4.2.dts +++ b/arch/arm/boot/dts/xenvm-4.2.dts @@ -29,6 +29,19 @@ compatible = "arm,cortex-a15"; reg = <0>; }; + + cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a15"; + reg = <1>; + }; + }; + + psci { + compatible = "arm,psci"; + method = "hvc"; + cpu_off = <1>; + cpu_on = <2>; }; memory@80000000 { -- cgit v1.1