Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667f390b authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King
Browse files

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: default avatarJean-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: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent adf00400

arch/arm/mach-integrator/integrator_ap.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static void ap_flash_exit(struct platform_device *dev) 
	}

}



static void ap_flash_set_vpp(struct map_info *map, int on)

static void ap_flash_set_vpp(struct platform_device *pdev, int on)

{

	void __iomem *reg = on ? SC_CTRLS : SC_CTRLC;

arch/arm/mach-integrator/integrator_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void intcp_flash_exit(struct platform_device *dev) 
	writel(val, INTCP_VA_CTRL_BASE + INTCP_FLASHPROG);

}



static void intcp_flash_set_vpp(struct map_info *map, int on)

static void intcp_flash_set_vpp(struct platform_device *pdev, int on)

{

	u32 val;

arch/arm/mach-omap1/flash.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <plat/tc.h>

#include <plat/flash.h>



void omap1_set_vpp(struct map_info *map, int enable)

void omap1_set_vpp(struct platform_device *pdev, int enable)

{

	static int count;

	u32 l;

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static struct platform_device bq24022 = { 
 * StrataFlash

 */



static void hx4700_set_vpp(struct map_info *map, int vpp)

static void hx4700_set_vpp(struct platform_device *pdev, int vpp)

{

	gpio_set_value(GPIO91_HX4700_FLASH_VPEN, vpp);

}

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static struct pxaohci_platform_data magician_ohci_info = { 
 * StrataFlash

 */



static void magician_set_vpp(struct map_info *map, int vpp)

static void magician_set_vpp(struct platform_device *pdev, int vpp)

{

	gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);

}