Merge tag 'regulator-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[muen/linux.git] / arch / arm / mach-pxa / em-x270.c

diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index b14c47a6ee6b79d92c3615499ee45ddd00c57059..67e37df637f5ca23e7038d1c866d26ab50a40746 100644 (file)
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -15,8 +15,7 @@
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>

-#include <linux/mtd/rawnand.h>
-#include <linux/mtd/partitions.h>
+#include <linux/mtd/platnand.h>

 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>


@@ -285,11 +284,10 @@ static void nand_cs_off(void)
 }
 
 /* hardware specific access to control-lines */
 }
 
 /* hardware specific access to control-lines */

-static void em_x270_nand_cmd_ctl(struct mtd_info *mtd, int dat,
+static void em_x270_nand_cmd_ctl(struct nand_chip *this, int dat,

                                 unsigned int ctrl)
 {
                                 unsigned int ctrl)
 {

-       struct nand_chip *this = mtd_to_nand(mtd);
-       unsigned long nandaddr = (unsigned long)this->IO_ADDR_W;
+       unsigned long nandaddr = (unsigned long)this->legacy.IO_ADDR_W;

 
        dsb();
 
 
        dsb();
 


@@ -309,15 +307,15 @@ static void em_x270_nand_cmd_ctl(struct mtd_info *mtd, int dat,
        }
 
        dsb();
        }
 
        dsb();

-       this->IO_ADDR_W = (void __iomem *)nandaddr;
+       this->legacy.IO_ADDR_W = (void __iomem *)nandaddr;

        if (dat != NAND_CMD_NONE)
        if (dat != NAND_CMD_NONE)

-               writel(dat, this->IO_ADDR_W);
+               writel(dat, this->legacy.IO_ADDR_W);

 
        dsb();
 }
 
 /* read device ready pin */
 
        dsb();
 }
 
 /* read device ready pin */

-static int em_x270_nand_device_ready(struct mtd_info *mtd)
+static int em_x270_nand_device_ready(struct nand_chip *this)

 {
        dsb();
 
 {
        dsb();