Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e32d1b authored by Paul Parsons's avatar Paul Parsons Committed by Samuel Ortiz
Browse files

mfd: Fix ASIC3 SD Host Controller Configuration size 



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: default avatarPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d910774f

drivers/mfd/asic3.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -856,7 +856,8 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, 




	/* MMC */

	/* MMC */

	asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +

	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) {

	if (!asic->tmio_cnf) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");

		dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");

include/linux/mfd/asic3.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -297,6 +297,7 @@ struct asic3_platform_data { 
 *

 *

 *****************************************************************************/

 *****************************************************************************/

#define ASIC3_SD_CONFIG_BASE	0x0400 /* Assumes 32 bit addressing */

#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_SD_CTRL_BASE	0x1000

#define ASIC3_SDIO_CTRL_BASE	0x1200

#define ASIC3_SDIO_CTRL_BASE	0x1200