linux-mips
[Top] [All Lists]

[PATCH] mmc: au1xmmc: allow platforms to disable host capabilities

To: linux-mmc@vger.kernel.org
Subject: [PATCH] mmc: au1xmmc: allow platforms to disable host capabilities
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Wed, 14 Oct 2009 09:38:06 +0200
Cc: Manuel Lauss <manuel.lauss@gmail.com>, Linux-MIPS <linux-mips@linux-mips.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=oAVZZzWb0/CoWi0octy59QKzZY3VsEq09BQvn2xnso8=; b=dmShsszarxddIYNpMMLkW3bBpgzTrMHAZnjvLUxsoMnHR1cIljQ0+HLhUk83ua+tZz /AMrrnQWBInD/a1c0a7fxR1rjZ0583ahTcUGAhrAcAGoX91xnr2AnG697QX0M19Z9TkT cN2r7ZrEr/XXDQBx3dOGUDm4HJYCy/qmbOuQI=
Domainkey-signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:organization:user-agent:mime-version:to:cc :subject:content-type:content-transfer-encoding; b=l/kjHbYqG3EmUDOo2Q9GupgAa4XUKTM6g8rzKivJ/ZhaZru1w8OPPyTRfHl1kCYikl 2gz1fZsB8NZJoT+T8An9bd+6+iWEhYTSRgKBjPvnPlwpFEe6K3idiwbzfHLimLB2/UkE qXnZI9C9c1qh/8d+r89EW8tjy/pvfUz7cdfrc=
Organization: Private
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Thunderbird 2.0.0.23 (X11/20090828)
Although the hardware supports a 4/8bit SD interface and the driver
unconditionally advertises all hardware caps to the MMC core, not all
datalines may actually be wired up.  This patch introduces another
field to au1xmmc platform data allowing platforms to disable certain
advanced host controller features.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 arch/mips/include/asm/mach-au1x00/au1100_mmc.h |    1 +
 drivers/mmc/host/au1xmmc.c                     |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/mips/include/asm/mach-au1x00/au1100_mmc.h 
b/arch/mips/include/asm/mach-au1x00/au1100_mmc.h
index c35e209..a674643 100644
--- a/arch/mips/include/asm/mach-au1x00/au1100_mmc.h
+++ b/arch/mips/include/asm/mach-au1x00/au1100_mmc.h
@@ -46,6 +46,7 @@ struct au1xmmc_platform_data {
        int(*card_readonly)(void *mmc_host);
        void(*set_power)(void *mmc_host, int state);
        struct led_classdev *led;
+       unsigned long mask_host_caps;
 };

 #define SD0_BASE       0xB0600000
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 7534726..e2caf5a 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -1025,6 +1025,10 @@ static int __devinit au1xmmc_probe(struct 
platform_device *pdev)
        } else
                mmc->caps |= MMC_CAP_NEEDS_POLL;

+       /* platform may not be able to use all advertised caps */
+       if (host->platdata)
+               mmc->caps &= ~(host->platdata->mask_host_caps);
+
        tasklet_init(&host->data_task, au1xmmc_tasklet_data,
                        (unsigned long)host);

-- 
1.6.5


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] mmc: au1xmmc: allow platforms to disable host capabilities, Manuel Lauss <=