mtd: Fix endianness issues from device tree

This patch adds the appropriate conversions to correct the endianness
issues in the MTD driver whenever it accesses the device tree (which is
always big endian).

Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index c8ab15653e7c..efdcca94ce55 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -222,7 +222,7 @@ static int __devinit fun_probe(struct platform_device *ofdev,
 {
         struct fsl_upm_nand *fun;
         struct resource io_res;
-        const uint32_t *prop;
+        const __be32 *prop;
         int rnb_gpio;
         int ret;
         int size;
@@ -270,7 +270,7 @@ static int __devinit fun_probe(struct platform_device *ofdev,
                         goto err1;
                 }
                 for (i = 0; i < fun->mchip_count; i++)
-                        fun->mchip_offsets[i] = prop[i];
+                        fun->mchip_offsets[i] = be32_to_cpu(prop[i]);
         } else {
                 fun->mchip_count = 1;
         }
@@ -295,13 +295,13 @@ static int __devinit fun_probe(struct platform_device *ofdev,
 
         prop = of_get_property(ofdev->dev.of_node, "chip-delay", NULL);
         if (prop)
-                fun->chip_delay = *prop;
+                fun->chip_delay = be32_to_cpup(prop);
         else
                 fun->chip_delay = 50;
 
         prop = of_get_property(ofdev->dev.of_node, "fsl,upm-wait-flags", &size);
         if (prop && size == sizeof(uint32_t))
-                fun->wait_flags = *prop;
+                fun->wait_flags = be32_to_cpup(prop);
         else
                 fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
                                   FSL_UPM_WAIT_WRITE_BYTE;
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index f4610bc7ccd0..469e649c911c 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -663,7 +663,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op,
 #endif
         struct nand_chip *chip;
         unsigned long regs_paddr, regs_size;
-        const uint *chips_no;
+        const __be32 *chips_no;
         int resettime = 0;
         int retval = 0;
         int rev, len;
@@ -806,7 +806,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op,
         }
 
         /* Detect NAND chips */
-        if (nand_scan(mtd, *chips_no)) {
+        if (nand_scan(mtd, be32_to_cpup(chips_no))) {
                 dev_err(dev, "NAND Flash not found !\n");
                 devm_free_irq(dev, prv->irq, mtd);
                 retval = -ENXIO;
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 510554e6c115..c9ae0a5023b6 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -229,7 +229,7 @@ static int __devinit ndfc_probe(struct platform_device *ofdev,
                                 const struct of_device_id *match)
 {
         struct ndfc_controller *ndfc = &ndfc_ctrl;
-        const u32 *reg;
+        const __be32 *reg;
         u32 ccr;
         int err, len;
 
@@ -244,7 +244,7 @@ static int __devinit ndfc_probe(struct platform_device *ofdev,
                 dev_err(&ofdev->dev, "unable read reg property (%d)\n", len);
                 return -ENOENT;
         }
-        ndfc->chip_select = reg[0];
+        ndfc->chip_select = be32_to_cpu(reg[0]);
 
         ndfc->ndfcbase = of_iomap(ofdev->dev.of_node, 0);
         if (!ndfc->ndfcbase) {
@@ -257,7 +257,7 @@ static int __devinit ndfc_probe(struct platform_device *ofdev,
         /* It is ok if ccr does not exist - just default to 0 */
         reg = of_get_property(ofdev->dev.of_node, "ccr", NULL);
         if (reg)
-                ccr |= *reg;
+                ccr |= be32_to_cpup(reg);
 
         out_be32(ndfc->ndfcbase + NDFC_CCR, ccr);
 
@@ -265,7 +265,7 @@ static int __devinit ndfc_probe(struct platform_device *ofdev,
         reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
         if (reg) {
                 int offset = NDFC_BCFG0 + (ndfc->chip_select << 2);
-                out_be32(ndfc->ndfcbase + offset, *reg);
+                out_be32(ndfc->ndfcbase + offset, be32_to_cpup(reg));
         }
 
         err = ndfc_chip_init(ndfc, ofdev->dev.of_node);