diff options
author | Pawel Moll <pawel.moll@arm.com> | 2012-10-09 07:56:36 -0400 |
---|---|---|
committer | Pawel Moll <pawel.moll@arm.com> | 2012-11-05 12:09:51 -0500 |
commit | 38669e045dbf8f62a008898a7fb1e93975b3817c (patch) | |
tree | b989816e1a4625729189c08eb08367bc73b268ff /arch/arm/mach-vexpress/platsmp.c | |
parent | 842839a37a9a9ac12d88930b6605c620fc09bc1d (diff) |
ARM: vexpress: Start using new Versatile Express infrastructure
This patch starts using all the configuration infrastructure.
- generic GPIO library is forced now
- sysreg GPIOs are used as MMC CD and WP information sources;
thanks to this MMCI auxiliary data is not longer necessary
- DVI muxer and mode control is removed from non-DT V2P-CA9 code
as this is now handled by the vexpress-dvi driver
- clock generators control is removed as is being handled by the
common clock driver now
- the sysreg and sysctl control is now delegated to the
appropriate drivers and all related code was removed
- NOR Flash set_vpp function has been removed as the control
bit used does _not_ control its VPP line, but the #WP signal
instead (which is de facto unusable in case of Linux MTD
drivers); this also allowed the remove its DT auxiliary
data
The non-DT code defines only minimal required number of
the config devices. Device Trees are updated to make use
of all new features.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/mach-vexpress/platsmp.c')
-rw-r--r-- | arch/arm/mach-vexpress/platsmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c index 7db27c8c05cc..c5d70de9bb4e 100644 --- a/arch/arm/mach-vexpress/platsmp.c +++ b/arch/arm/mach-vexpress/platsmp.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/of_fdt.h> | 15 | #include <linux/of_fdt.h> |
16 | #include <linux/vexpress.h> | ||
16 | 17 | ||
17 | #include <asm/smp_scu.h> | 18 | #include <asm/smp_scu.h> |
18 | #include <asm/hardware/gic.h> | 19 | #include <asm/hardware/gic.h> |
@@ -193,7 +194,7 @@ static void __init vexpress_smp_prepare_cpus(unsigned int max_cpus) | |||
193 | * until it receives a soft interrupt, and then the | 194 | * until it receives a soft interrupt, and then the |
194 | * secondary CPU branches to this address. | 195 | * secondary CPU branches to this address. |
195 | */ | 196 | */ |
196 | v2m_flags_set(virt_to_phys(versatile_secondary_startup)); | 197 | vexpress_flags_set(virt_to_phys(versatile_secondary_startup)); |
197 | } | 198 | } |
198 | 199 | ||
199 | struct smp_operations __initdata vexpress_smp_ops = { | 200 | struct smp_operations __initdata vexpress_smp_ops = { |