mfd: Fix ASIC3 SD Host Controller Configuration size

lostdistance · Samuel Ortiz · commit 74e32d1b68f1 · 2011-05-26T19:45:51.000+02:00
The size of the TC6380AF SD Host Controller Configuration area is 0x200 bytes (assuming registers are aligned on 32-bit boundaries), not 0x400 bytes. Source: Toshiba TC6380AF Specification sections 4.2 and 4.3.1

Signed-off-by: Paul Parsons &lt;lost.distance@yahoo.com&gt;
Signed-off-by: Samuel Ortiz &lt;sameo@linux.intel.com&gt;
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
@@ -856,7 +856,8 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
 
 	/* MMC */
 	asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +
-				 mem_sdio->start, 0x400 >> asic->bus_shift);
+				 mem_sdio->start,
+				 ASIC3_SD_CONFIG_SIZE >> asic->bus_shift);
 	if (!asic->tmio_cnf) {
 		ret = -ENOMEM;
 		dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");
diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h
@@ -297,6 +297,7 @@ struct asic3_platform_data {
  *
  *****************************************************************************/
 #define ASIC3_SD_CONFIG_BASE	0x0400 /* Assumes 32 bit addressing */
+#define ASIC3_SD_CONFIG_SIZE	0x0200 /* Assumes 32 bit addressing */
 #define ASIC3_SD_CTRL_BASE	0x1000
 #define ASIC3_SDIO_CTRL_BASE	0x1200
 

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ struct asic3_platform_data {`
`297`	`297`	`*`
`298`	`298`	`*****************************************************************************/`
`299`	`299`	`#define ASIC3_SD_CONFIG_BASE 0x0400 /* Assumes 32 bit addressing */`
	`300`	`+#define ASIC3_SD_CONFIG_SIZE 0x0200 /* Assumes 32 bit addressing */`
`300`	`301`	`#define ASIC3_SD_CTRL_BASE 0x1000`
`301`	`302`	`#define ASIC3_SDIO_CTRL_BASE 0x1200`
`302`	`303`