diff options
| author | Ian Munsie | 2010-10-01 09:06:08 +0200 |
|---|---|---|
| committer | David Woodhouse | 2010-10-25 01:55:56 +0200 |
| commit | 766f271a63d1ee7caed8030736e6aed253d02073 (patch) | |
| tree | 198b4cf3efd5de59121bdca483a095b8234b588a /drivers/mtd/nand/fsl_upm.c | |
| parent | mtd: m25p80.c: Add support for S25FL032P spi-nor flash devices. (diff) | |
| download | kernel-qcow2-linux-766f271a63d1ee7caed8030736e6aed253d02073.tar.gz kernel-qcow2-linux-766f271a63d1ee7caed8030736e6aed253d02073.tar.xz kernel-qcow2-linux-766f271a63d1ee7caed8030736e6aed253d02073.zip | |
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>
Diffstat (limited to 'drivers/mtd/nand/fsl_upm.c')
| -rw-r--r-- | drivers/mtd/nand/fsl_upm.c | 8 |
1 files changed, 4 insertions, 4 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; |