* [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2
@ 2008-11-21 9:24 Adrian Hunter
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:24 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
For HSMMC2 and HSMMC3 set SDVSS to 1.8V in HCTL before enabling the SDBP bit.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a134f76..4bc25c0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1197,15 +1197,16 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
}
if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- & SDVSCLR);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDVS30);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDBP);
+ u32 hctl = OMAP_HSMMC_READ(host->base, HCTL) &
+ SDVSCLR;
+
+ if (host->id == OMAP_MMC1_DEVID)
+ hctl |= SDVS30;
+ else
+ hctl |= SDVS18;
+
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl);
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl | SDBP);
}
mmc_omap_fclk_state(host, OFF);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 0/9] OMAP: HSMMC: Patches
@ 2008-11-21 9:23 Adrian Hunter
2008-11-21 9:37 ` Adrian Hunter
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:23 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Hi
OMAP HSMMC is not ready for mainline, but development is ongoing.
In the meantime these patches are best posted and applied via
omap mailing list and tree.
Regards
Adrian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 0/9] OMAP: HSMMC: Patches
2008-11-21 9:23 [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
@ 2008-11-21 9:37 ` Adrian Hunter
2008-11-21 9:46 ` [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
2008-11-21 9:55 ` [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:37 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Adrian Hunter wrote:
> Hi
>
> OMAP HSMMC is not ready for mainline, but development is ongoing.
>
> In the meantime these patches are best posted and applied via
> omap mailing list and tree.
>
> Regards
> Adrian
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Just realised I forgot the from lines in all those patches - will resend.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2
2008-11-21 9:37 ` Adrian Hunter
@ 2008-11-21 9:46 ` Adrian Hunter
2008-11-21 9:55 ` [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
1 sibling, 0 replies; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:46 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
From: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Date: Tue, 28 Oct 2008 11:12:28 +0200
For HSMMC2 and HSMMC3 set SDVSS to 1.8V in HCTL before enabling the SDBP bit.
Fixes bug 84194.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a134f76..4bc25c0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1197,15 +1197,16 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
}
if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- & SDVSCLR);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDVS30);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDBP);
+ u32 hctl = OMAP_HSMMC_READ(host->base, HCTL) &
+ SDVSCLR;
+
+ if (host->id == OMAP_MMC1_DEVID)
+ hctl |= SDVS30;
+ else
+ hctl |= SDVS18;
+
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl);
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl | SDBP);
}
mmc_omap_fclk_state(host, OFF);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 0/9] OMAP: HSMMC: Patches
2008-11-21 9:37 ` Adrian Hunter
2008-11-21 9:46 ` [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
@ 2008-11-21 9:55 ` Adrian Hunter
2008-11-21 9:57 ` [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
1 sibling, 1 reply; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:55 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Adrian Hunter wrote:
> Adrian Hunter wrote:
>> OMAP HSMMC is not ready for mainline, but development is ongoing.
>>
>> In the meantime these patches are best posted and applied via
>> omap mailing list and tree.
>
> Just realised I forgot the from lines in all those patches - will resend.
>
And now 4 and 5 again without the spurious bug references...
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2
2008-11-21 9:55 ` [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
@ 2008-11-21 9:57 ` Adrian Hunter
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:57 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
From: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Date: Tue, 28 Oct 2008 11:12:28 +0200
For HSMMC2 and HSMMC3 set SDVSS to 1.8V in HCTL before enabling the SDBP bit.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a134f76..4bc25c0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1197,15 +1197,16 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
}
if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- & SDVSCLR);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDVS30);
- OMAP_HSMMC_WRITE(host->base, HCTL,
- OMAP_HSMMC_READ(host->base, HCTL)
- | SDBP);
+ u32 hctl = OMAP_HSMMC_READ(host->base, HCTL) &
+ SDVSCLR;
+
+ if (host->id == OMAP_MMC1_DEVID)
+ hctl |= SDVS30;
+ else
+ hctl |= SDVS18;
+
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl);
+ OMAP_HSMMC_WRITE(host->base, HCTL, hctl | SDBP);
}
mmc_omap_fclk_state(host, OFF);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-11-21 9:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-21 9:24 [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
-- strict thread matches above, loose matches on Subject: below --
2008-11-21 9:23 [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
2008-11-21 9:37 ` Adrian Hunter
2008-11-21 9:46 ` [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
2008-11-21 9:55 ` [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
2008-11-21 9:57 ` [PATCH 4/9] OMAP: HSMMC: Fix suspend/resume for MMCHS2 Adrian Hunter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox