[PATCH 04/05] tmio_mmc: Make cnf area optional

[Magnus Damm]

From:  Magnus Damm <damm@xxxxxxxxxxxxx>

Add support for tmio_mmc hardware configurations that
lack the cnf io area. With this patch such hardware
can pass a single ctl io area with the platform data.

Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
---

 drivers/mmc/host/tmio_mmc.c |   33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

--- 0012/drivers/mmc/host/tmio_mmc.c
+++ work/drivers/mmc/host/tmio_mmc.c	2009-03-11 19:35:46.000000000 +0900
@@ -37,12 +37,18 @@
 
 static void tmio_mmc_cnf_power(struct tmio_mmc_host *host, int on)
 {
+	if (!host->cnf)
+		return;
+
 	tmio_iowrite8(on ? 0x02 : 0x00, host->cnf + CNF_PWR_CTL_2);
 }
 
 static void tmio_mmc_cnf_setup_regs(struct tmio_mmc_host *host,
 				    struct platform_device *dev)
 {
+	if (!host->cnf)
+		return;
+
 	/* Enable the MMC/SD Control registers */
 	tmio_iowrite16(SDCREN, host->cnf + CNF_CMD);
 	tmio_iowrite32(dev->resource[0].start & 0xfffe,
@@ -52,12 +58,18 @@ static void tmio_mmc_cnf_setup_regs(stru
 static void tmio_mmc_cnf_setup_clock(struct tmio_mmc_host *host,
 				     int divide_by_one)
 {
+	if (!host->cnf)
+		return;
+
 	tmio_iowrite8(divide_by_one ? 0 : 1,
 		      host->cnf + CNF_SD_CLK_MODE);
 }
 
 static void tmio_mmc_cnf_setup_late(struct tmio_mmc_host *host)
 {
+	if (!host->cnf)
+		return;
+
 	/* Disable SD power during suspend */
 	tmio_iowrite8(0x01, host->cnf + CNF_PWR_CTL_3);
 
@@ -576,12 +588,8 @@ static int __devinit tmio_mmc_probe(stru
 	struct mmc_host *mmc;
 	int ret = -ENOMEM;
 
-	if (dev->num_resources != 3)
-		goto out;
-
 	res_ctl = platform_get_resource(dev, IORESOURCE_MEM, 0);
-	res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);
-	if (!res_ctl || !res_cnf) {
+	if (!res_ctl) {
 		ret = -EINVAL;
 		goto out;
 	}
@@ -598,9 +606,12 @@ static int __devinit tmio_mmc_probe(stru
 	if (!host->ctl)
 		goto host_free;
 
-	host->cnf = ioremap(res_cnf->start, resource_size(res_cnf));
-	if (!host->cnf)
-		goto unmap_ctl;
+	res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);
+	if (res_cnf) {
+		host->cnf = ioremap(res_cnf->start, resource_size(res_cnf));
+		if (!host->cnf)
+			goto unmap_ctl;
+	}
 
 	mmc->ops = &tmio_mmc_ops;
 	mmc->caps = MMC_CAP_4_BIT_DATA;
@@ -651,7 +662,8 @@ static int __devinit tmio_mmc_probe(stru
 	return 0;
 
 unmap_cnf:
-	iounmap(host->cnf);
+	if (host->cnf)
+		iounmap(host->cnf);
 unmap_ctl:
 	iounmap(host->ctl);
 host_free:
@@ -670,8 +682,9 @@ static int __devexit tmio_mmc_remove(str
 		struct tmio_mmc_host *host = mmc_priv(mmc);
 		mmc_remove_host(mmc);
 		free_irq(host->irq, host);
+		if (host->cnf)
+			iounmap(host->cnf);
 		iounmap(host->ctl);
-		iounmap(host->cnf);
 		mmc_free_host(mmc);
 	}
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/