3 files changed, 10 insertions, 3 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 6f512b5c117b..ea22520c0406 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -924,6 +924,13 @@ static int __devinit m25p_probe(struct spi_device *spi)
                         nr_parts = data->nr_parts;
                 }
 
+#ifdef CONFIG_OF
+                if (nr_parts <= 0 && spi->dev.of_node) {
+                        nr_parts = of_mtd_parse_partitions(&spi->dev,
+                                        spi->dev.of_node, &parts);
+                }
+#endif
+
                 if (nr_parts > 0) {
                         for (i = 0; i < nr_parts; i++) {
                                 DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index fe63f6bd663c..ec3edf6e68b4 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -294,7 +294,7 @@ static int __devinit of_flash_probe(struct platform_device *dev,
                 info->list[i].map.name = dev_name(&dev->dev);
                 info->list[i].map.phys = res.start;
                 info->list[i].map.size = res_size;
-                info->list[i].map.bankwidth = *width;
+                info->list[i].map.bankwidth = be32_to_cpup(width);
 
                 err = -ENOMEM;
                 info->list[i].map.virt = ioremap(info->list[i].map.phys,
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 8bf7dc6d1ce6..7bd171eefd21 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -53,8 +53,8 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                         continue;
                 }
 
-                (*pparts)[i].offset = reg[0];
-                (*pparts)[i].size = reg[1];
+                (*pparts)[i].offset = be32_to_cpu(reg[0]);
+                (*pparts)[i].size = be32_to_cpu(reg[1]);
 
                 partname = of_get_property(pp, "label", &len);
                 if (!partname)