aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2011-05-18 05:51:55 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 17:27:34 -0400
commit667f390bee987d45351402e42008c52cdfb77d76 (patch)
tree93b6a563915a4013c842302dd45dc3b4ee926d4e /arch/arm/mach-vexpress
parentadf0040096e4b45b9d1c12f59f9045951178ca00 (diff)
ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info
The set_vpp() method provided by physmap passes a map_info back to the platform code, which has little relevance as far as the platform is concerned (this parameter is completely unused). Instead, pass the platform_device, which can be used in the pismo driver to retrieve some important information in a nicer way, instead of the hack that was in place. The empty set_vpp function in board-at572d940hf_ek.c is left untouched, as the board/SoC is scheduled for removal. Cc: Andrew Victor <linux@maxim.org.za> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Philipp Zabel <philipp.zabel@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r--arch/arm/mach-vexpress/v2m.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index e3268152c834..f860314ef7f6 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -206,7 +206,7 @@ static struct platform_device v2m_usb_device = {
206 .dev.platform_data = &v2m_usb_config, 206 .dev.platform_data = &v2m_usb_config,
207}; 207};
208 208
209static void v2m_flash_set_vpp(struct map_info *map, int on) 209static void v2m_flash_set_vpp(struct platform_device *pdev, int on)
210{ 210{
211 writel(on != 0, MMIO_P2V(V2M_SYS_FLASH)); 211 writel(on != 0, MMIO_P2V(V2M_SYS_FLASH));
212} 212}