From: Chris Ball <cjb@laptop.org>
To: Arnd Hannemann <arnd@arndnet.de>
Cc: linux-mmc@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org, g.liakhovetski@gmx.de,
Ian Molton <ian@mnementh.co.uk>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: [PATCH 1/6 v3] mmc: tmio: implement SDIO IRQ
Date: Wed, 5 Jan 2011 20:57:17 +0000 [thread overview]
Message-ID: <20110105205717.GG9198@void.printf.net> (raw)
In-Reply-To: <1293574956-30035-2-git-send-email-arnd@arndnet.de>
Hi Arnd,
On Tue, Dec 28, 2010 at 11:22:31PM +0100, Arnd Hannemann wrote:
> This patch implements SDIO IRQ support for mfds which
> announce the TMIO_MMC_SDIO_IRQ flag for tmio_mmc.
> If MMC_CAP_SDIO_IRQ is also set SDIO IRQ signalling is activated.
> Tested with a b43-based wireless SDIO card and sh_mobile_sdhi.
>
> Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
Thanks, pushed to mmc-next for .38 with minor 80-col changes below:
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index d74cdac..8d55b8a 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -298,8 +298,9 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
/*
* Testing on sh-mobile showed that SDIO IRQs are unmasked when
- * CTL_CLK_AND_WAIT_CTL gets written, so we have to disable the device IRQ
- * here and restore the SDIO IRQ mask before re-enabling the device IRQ.
+ * CTL_CLK_AND_WAIT_CTL gets written, so we have to disable the
+ * device IRQ here and restore the SDIO IRQ mask before
+ * re-enabling the device IRQ.
*/
if (pdata->flags & TMIO_MMC_SDIO_IRQ)
disable_irq(host->irq);
@@ -623,8 +624,9 @@ static irqreturn_t tmio_mmc_irq(int irq, void *devid)
sd_ctrl_write16(host, CTL_SDIO_STATUS, sdio_status & ~TMIO_SDIO_MASK_ALL);
if (sdio_ireg && !host->sdio_irq_enabled) {
- pr_warning("tmio_mmc: Spurious SDIO IRQ, disabling! 0x%04x 0x%04x 0x%04x\n",
- sdio_status, sdio_irq_mask, sdio_ireg);
+ pr_warning("tmio_mmc: Spurious SDIO IRQ, disabling! "
+ "0x%04x 0x%04x 0x%04x\n",
+ sdio_status, sdio_irq_mask, sdio_ireg);
tmio_mmc_enable_sdio_irq(host->mmc, 0);
goto out;
}
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
WARNING: multiple messages have this Message-ID (diff)
From: Chris Ball <cjb@laptop.org>
To: Arnd Hannemann <arnd@arndnet.de>
Cc: linux-mmc@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org, g.liakhovetski@gmx.de,
Ian Molton <ian@mnementh.co.uk>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: [PATCH 1/6 v3] mmc: tmio: implement SDIO IRQ
Date: Wed, 05 Jan 2011 20:57:17 +0000 [thread overview]
Message-ID: <20110105205717.GG9198@void.printf.net> (raw)
In-Reply-To: <1293574956-30035-2-git-send-email-arnd@arndnet.de>
Hi Arnd,
On Tue, Dec 28, 2010 at 11:22:31PM +0100, Arnd Hannemann wrote:
> This patch implements SDIO IRQ support for mfds which
> announce the TMIO_MMC_SDIO_IRQ flag for tmio_mmc.
> If MMC_CAP_SDIO_IRQ is also set SDIO IRQ signalling is activated.
> Tested with a b43-based wireless SDIO card and sh_mobile_sdhi.
>
> Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
Thanks, pushed to mmc-next for .38 with minor 80-col changes below:
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index d74cdac..8d55b8a 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -298,8 +298,9 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
/*
* Testing on sh-mobile showed that SDIO IRQs are unmasked when
- * CTL_CLK_AND_WAIT_CTL gets written, so we have to disable the device IRQ
- * here and restore the SDIO IRQ mask before re-enabling the device IRQ.
+ * CTL_CLK_AND_WAIT_CTL gets written, so we have to disable the
+ * device IRQ here and restore the SDIO IRQ mask before
+ * re-enabling the device IRQ.
*/
if (pdata->flags & TMIO_MMC_SDIO_IRQ)
disable_irq(host->irq);
@@ -623,8 +624,9 @@ static irqreturn_t tmio_mmc_irq(int irq, void *devid)
sd_ctrl_write16(host, CTL_SDIO_STATUS, sdio_status & ~TMIO_SDIO_MASK_ALL);
if (sdio_ireg && !host->sdio_irq_enabled) {
- pr_warning("tmio_mmc: Spurious SDIO IRQ, disabling! 0x%04x 0x%04x 0x%04x\n",
- sdio_status, sdio_irq_mask, sdio_ireg);
+ pr_warning("tmio_mmc: Spurious SDIO IRQ, disabling! "
+ "0x%04x 0x%04x 0x%04x\n",
+ sdio_status, sdio_irq_mask, sdio_ireg);
tmio_mmc_enable_sdio_irq(host->mmc, 0);
goto out;
}
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
next prev parent reply other threads:[~2011-01-05 20:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-28 22:22 [PATCH 0/6 v3] mmc: tmio: Add SDIO IRQ support Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2010-12-28 22:22 ` [PATCH 1/6 v3] mmc: tmio: implement SDIO IRQ Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2011-01-05 20:57 ` Chris Ball [this message]
2011-01-05 20:57 ` Chris Ball
2011-01-05 21:09 ` Guennadi Liakhovetski
2011-01-05 21:09 ` Guennadi Liakhovetski
2011-01-05 22:10 ` Chris Ball
2011-01-05 22:10 ` Chris Ball
2010-12-28 22:22 ` [PATCH 2/6 v3] mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2011-01-05 20:58 ` Chris Ball
2011-01-05 20:58 ` [PATCH 2/6 v3] mfd: sh_mobile_sdhi: activate SDIO IRQ for Chris Ball
2010-12-28 22:22 ` [PATCH 3/6 v3] ARM: mach-shmobile: sh7372 Enable SDIO IRQs Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2011-01-06 4:11 ` Paul Mundt
2011-01-06 4:11 ` Paul Mundt
2010-12-28 22:22 ` [PATCH 4/6 v3] sh: sh7724 " Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2011-01-06 4:12 ` Paul Mundt
2011-01-06 4:12 ` Paul Mundt
2010-12-28 22:22 ` [PATCH 5/6 v3] sh: sh7722 " Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
2010-12-28 22:22 ` [PATCH 6/6 v3] sh: sh7723 / ap325rxa enable " Arnd Hannemann
2010-12-28 22:22 ` Arnd Hannemann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110105205717.GG9198@void.printf.net \
--to=cjb@laptop.org \
--cc=arnd@arndnet.de \
--cc=g.liakhovetski@gmx.de \
--cc=ian@mnementh.co.uk \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.