From patchwork Wed Oct 6 18:28:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madhusudhan X-Patchwork-Id: 236691 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o96ITfLr025081 for ; Wed, 6 Oct 2010 18:29:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933014Ab0JFS2o (ORCPT ); Wed, 6 Oct 2010 14:28:44 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:52612 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933011Ab0JFS2n (ORCPT ); Wed, 6 Oct 2010 14:28:43 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o96ISJrd025140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Oct 2010 13:28:19 -0500 Received: from webmail.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o96ISF9H022953; Wed, 6 Oct 2010 13:28:16 -0500 (CDT) Received: from 192.168.10.88 (proxying for 128.247.79.84) (SquirrelMail authenticated user x0070977); by dbdmail.itg.ti.com with HTTP; Wed, 6 Oct 2010 23:58:19 +0530 (IST) Message-ID: <56009.192.168.10.88.1286389699.squirrel@dbdmail.itg.ti.com> In-Reply-To: References: <20100827192248.GJ20407@void.printf.net> <4C7CC480.2040903@csr.com> <4C7F3E0F.2080402@compulab.co.il> <4CAC146D.3040001@compulab.co.il> <4CAC7D65.8010705@compulab.co.il> Date: Wed, 6 Oct 2010 23:58:19 +0530 (IST) Subject: Re: [PATCH 0/2] mmc: omap_hsmmc: support SDIO cards (#2) From: "Madhusudhan Chikkature" To: "Steve Sakoman" Cc: "Mike Rapoport" , "David Vrabel" , "Chris Ball" , linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org, "Adrian Hunter" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 18:29:42 +0000 (UTC) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 4693e62..948dd9a 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -66,6 +66,7 @@ #define SDVS_MASK 0x00000E00 #define SDVSCLR 0xFFFFF1FF #define SDVSDET 0x00000400 +#define ENAWAKEUP (1 << 2) #define AUTOIDLE 0x1 #define SDBP (1 << 8) #define DTO 0xe @@ -76,9 +77,12 @@ #define CLKD_SHIFT 6 #define DTO_MASK 0x000F0000 #define DTO_SHIFT 16 +#define CIRQ_ENABLE (1 << 8) #define INT_EN_MASK 0x307F0033 #define BWR_ENABLE (1 << 4) #define BRR_ENABLE (1 << 5) +#define CTPL (1 << 11) +#define CLKEXTFREE (1 << 16) #define DTO_ENABLE (1 << 20) #define INIT_STREAM (1 << 1) #define DP_SELECT (1 << 21) @@ -87,10 +91,12 @@ #define MSBS (1 << 5) #define BCE (1 << 1) #define FOUR_BIT (1 << 1) +#define IWE (1 << 24) #define DW8 (1 << 5) #define CC 0x1 #define TC 0x02 #define OD 0x1 +#define CIRQ (1 << 8) #define ERR (1 << 15) #define CMD_TIMEOUT (1 << 16) #define DATA_TIMEOUT (1 << 20) @@ -184,6 +190,7 @@ struct omap_hsmmc_host { int reqs_blocked; int use_reg; int req_in_progress; + int sdio_int; struct omap_mmc_platform_data *pdata; }; @@ -551,6 +558,9 @@ static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, if (cmd->opcode == MMC_ERASE) irq_mask &= ~DTO_ENABLE; + if (host->sdio_int) + irq_mask |= CIRQ; + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);