From d026e474128448a456b62af45a287bec14e5fb1d Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 17 Jul 2009 13:10:26 +0200 Subject: [PATCH 32/38] MMC: Make the configuration memory resource optional Add support for tmio_mmc hardware configurations, that lack the cnf io area, like SuperH SoCs. With this patch such hardware can pass a single ctl io area with the platform data. Signed-off-by: Guennadi Liakhovetski CC: Magnus Damm --- drivers/mmc/host/tmio_mmc.c | 18 +++++++++++------- drivers/mmc/host/tmio_mmc.h | 6 ++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index 91991b4..c246191 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -519,12 +519,12 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) struct mmc_host *mmc; int ret = -EINVAL; - if (dev->num_resources != 3) + if (dev->num_resources < 2 || 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) goto out; pdata = cell->driver_data; @@ -548,9 +548,11 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) if (!host->ctl) goto host_free; - host->cnf = ioremap(res_cnf->start, resource_size(res_cnf)); - if (!host->cnf) - goto unmap_ctl; + 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; @@ -606,7 +608,8 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) return 0; unmap_cnf: - iounmap(host->cnf); + if (host->cnf) + iounmap(host->cnf); unmap_ctl: iounmap(host->ctl); host_free: @@ -626,7 +629,8 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev) mmc_remove_host(mmc); free_irq(host->irq, host); iounmap(host->ctl); - iounmap(host->cnf); + if (host->cnf) + iounmap(host->cnf); mmc_free_host(mmc); } diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 9fa9985..45f06aa 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -166,18 +166,24 @@ static inline void sd_ctrl_write32(struct tmio_mmc_host *host, int addr, static inline void sd_config_write8(struct tmio_mmc_host *host, int addr, u8 val) { + if (!host->cnf) + return; writeb(val, host->cnf + (addr << host->bus_shift)); } static inline void sd_config_write16(struct tmio_mmc_host *host, int addr, u16 val) { + if (!host->cnf) + return; writew(val, host->cnf + (addr << host->bus_shift)); } static inline void sd_config_write32(struct tmio_mmc_host *host, int addr, u32 val) { + if (!host->cnf) + return; writew(val, host->cnf + (addr << host->bus_shift)); writew(val >> 16, host->cnf + ((addr + 2) << host->bus_shift)); } -- 1.6.2.4