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>

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 11bd49e8b66304ffa91465478077a44dd29882f2..2aa98ee41b8dcf57bb442c1f3382e54ec8ee34e0 100644 (file)
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -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;
 

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index ec9628fe7109f00a2dda79bc9d317221f4a18f70..b676b41d70e2ec222f08d378fd6c2991260d113d 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -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;
 

diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index acd16166640861a61dff9a334179d12dcdc670e9..1749cb37dda0365985e6da1cc79e632f8564061b 100644 (file)
--- a/arch/arm/mach-omap1/flash.c
+++ b/arch/arm/mach-omap1/flash.c
@@ -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;

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 9cdcca59792455ede51f2046fcf66df898561779..f941a495a4a8ed1806a38233ac4236899fee4f34 100644 (file)
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -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);
 }

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 9984ef70bd794ff8e5a97ffff07ebc08eebb0988..e1920572948a9b1dcdc0d96a5be03a763f6f2e43 100644 (file)
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -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);
 }

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index d3f1dde70fc94a33797ef7941e0bddf8a14ef919..c8ec0888663395d2609b6abd0bce55f7be464e67 100644 (file)
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -77,7 +77,7 @@ void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
 
 #define REALVIEW_FLASHCTRL    (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_FLASH_OFFSET)
 
-static void realview_flash_set_vpp(struct map_info *map, int on)
+static void realview_flash_set_vpp(struct platform_device *pdev, int on)
 {
        u32 val;
 

diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c
index 598d130633dcd90a1896b5535270321c47a58674..ad9f750f1e556077c0f8331a5c17e8ac272e97c3 100644 (file)
--- a/arch/arm/mach-s3c2410/nor-simtec.c
+++ b/arch/arm/mach-s3c2410/nor-simtec.c
@@ -32,7 +32,7 @@
 
 #include "nor-simtec.h"
 
-static void simtec_nor_vpp(struct map_info *map, int vpp)
+static void simtec_nor_vpp(struct platform_device *pdev, int vpp)
 {
        unsigned int val;
        unsigned long flags;

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 06f406ad8edd9fab4df34f17c57006dec3faeab3..335d8250e364e068377e869478702d3b728d37ec 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -190,7 +190,7 @@ void __init versatile_map_io(void)
 
 #define VERSATILE_FLASHCTRL    (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_FLASH_OFFSET)
 
-static void versatile_flash_set_vpp(struct map_info *map, int on)
+static void versatile_flash_set_vpp(struct platform_device *pdev, int on)
 {
        u32 val;
 

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index e3268152c8341ab54729541907e90566f963040b..f860314ef7f696d15627bb63389df6dc4b291b7c 100644 (file)
--- 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 = {
        .dev.platform_data = &v2m_usb_config,
 };
 
-static void v2m_flash_set_vpp(struct map_info *map, int on)
+static void v2m_flash_set_vpp(struct platform_device *pdev, int on)
 {
        writel(on != 0, MMIO_P2V(V2M_SYS_FLASH));
 }

diff --git a/arch/arm/plat-omap/include/plat/flash.h b/arch/arm/plat-omap/include/plat/flash.h
index 3e6327016b402fccfe8304846fc26e047d6ec416..3083195123ea2c1f9c46ea840d56a83ceda838b0 100644 (file)
--- a/arch/arm/plat-omap/include/plat/flash.h
+++ b/arch/arm/plat-omap/include/plat/flash.h
@@ -11,6 +11,6 @@
 
 #include <linux/mtd/map.h>
 
-extern void omap1_set_vpp(struct map_info *map, int enable);
+extern void omap1_set_vpp(struct platform_device *pdev, int enable);
 
 #endif

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 49676b7a53a4e9e5fbfe08aa9c33c4ecda1466a0..1a9b94f0ee54fb3fab12975cc6fcad08235b61fe 100644 (file)
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -74,6 +74,18 @@ static int physmap_flash_remove(struct platform_device *dev)
        return 0;
 }
 
+static void physmap_set_vpp(struct map_info *map, int state)
+{
+       struct platform_device *pdev;
+       struct physmap_flash_data *physmap_data;
+
+       pdev = (struct platform_device *)map->map_priv_1;
+       physmap_data = pdev->dev.platform_data;
+
+       if (physmap_data->set_vpp)
+               physmap_data->set_vpp(pdev, state);
+}
+
 static const char *rom_probe_types[] = {
                                        "cfi_probe",
                                        "jedec_probe",
@@ -81,10 +93,7 @@ static const char *rom_probe_types[] = {
                                        "map_rom",
                                        NULL };
 #ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot",
-#ifdef CONFIG_MTD_AFS_PARTS
-                                         "afs",
-#endif
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
                                          NULL };
 #endif
 
@@ -134,8 +143,9 @@ static int physmap_flash_probe(struct platform_device *dev)
                info->map[i].phys = dev->resource[i].start;
                info->map[i].size = resource_size(&dev->resource[i]);
                info->map[i].bankwidth = physmap_data->width;
-               info->map[i].set_vpp = physmap_data->set_vpp;
+               info->map[i].set_vpp = physmap_set_vpp;
                info->map[i].pfow_base = physmap_data->pfow_base;
+               info->map[i].map_priv_1 = (unsigned long)dev;
 
                info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,
                                                 info->map[i].size);

diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index f4ce273e93fd5e5888adbc73c9e684bd5568849c..65bd1cd4d627992bad3feb49fe94a4235399632a 100644 (file)
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -50,39 +50,13 @@ struct pismo_data {
        struct platform_device  *dev[PISMO_NUM_CS];
 };
 
-/* FIXME: set_vpp could do with a better calling convention */
-static struct pismo_data *vpp_pismo;
-static DEFINE_MUTEX(pismo_mutex);
-
-static int pismo_setvpp_probe_fix(struct pismo_data *pismo)
+static void pismo_set_vpp(struct platform_device *pdev, int on)
 {
-       mutex_lock(&pismo_mutex);
-       if (vpp_pismo) {
-               mutex_unlock(&pismo_mutex);
-               kfree(pismo);
-               return -EBUSY;
-       }
-       vpp_pismo = pismo;
-       mutex_unlock(&pismo_mutex);
-       return 0;
-}
-
-static void pismo_setvpp_remove_fix(struct pismo_data *pismo)
-{
-       mutex_lock(&pismo_mutex);
-       if (vpp_pismo == pismo)
-               vpp_pismo = NULL;
-       mutex_unlock(&pismo_mutex);
-}
-
-static void pismo_set_vpp(struct map_info *map, int on)
-{
-       struct pismo_data *pismo = vpp_pismo;
+       struct i2c_client *client = to_i2c_client(pdev->dev.parent);
+       struct pismo_data *pismo = i2c_get_clientdata(client);
 
        pismo->vpp(pismo->vpp_data, on);
 }
-/* end of hack */
-
 
 static unsigned int __devinit pismo_width_to_bytes(unsigned int width)
 {
@@ -231,9 +205,6 @@ static int __devexit pismo_remove(struct i2c_client *client)
        for (i = 0; i < ARRAY_SIZE(pismo->dev); i++)
                platform_device_unregister(pismo->dev[i]);
 
-       /* FIXME: set_vpp needs saner arguments */
-       pismo_setvpp_remove_fix(pismo);
-
        kfree(pismo);
 
        return 0;
@@ -257,11 +228,6 @@ static int __devinit pismo_probe(struct i2c_client *client,
        if (!pismo)
                return -ENOMEM;
 
-       /* FIXME: set_vpp needs saner arguments */
-       ret = pismo_setvpp_probe_fix(pismo);
-       if (ret)
-               return ret;
-
        pismo->client = client;
        if (pdata) {
                pismo->vpp = pdata->set_vpp;

diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
index d37cca05e62c8e90d7a42b424855639d994c4ac1..49b959029417ced9e72e6693bd4407303223a2cb 100644 (file)
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -24,7 +24,7 @@ struct physmap_flash_data {
        unsigned int            width;
        int                     (*init)(struct platform_device *);
        void                    (*exit)(struct platform_device *);
-       void                    (*set_vpp)(struct map_info *, int);
+       void                    (*set_vpp)(struct platform_device *, int);
        unsigned int            nr_parts;
        unsigned int            pfow_base;
        char                    *probe_type;