omap4: hsmmc: Fix improper card detection while booting

omap4: hsmmc: Fix improper card detection while booting

[kishore kadiyala]

While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
are not getting detected some times.

During reset of command/data line, wrong pointer to base address
was passed while read operation to SYSCTL register, thus impacting
the updated reset logic.
Passing correct base address fixes the issue.

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Acked-by: Felipie Balbi <balbi@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Chris Ball   <cjb@laptop.org>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
---
 drivers/mmc/host/omap_hsmmc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 82a1079..5d46021 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1002,7 +1002,7 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host
*host,
 	 * Monitor a 0->1 transition first
 	 */
 	if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
-		while ((!(OMAP_HSMMC_READ(host, SYSCTL) & bit))
+		while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
 					&& (i++ < limit))
 			cpu_relax();
 	}
-- 
1.7.1

Re: omap4: hsmmc: Fix improper card detection while booting

[Felipe Balbi]

On Mon, Nov 15, 2010 at 03:08:59AM -0600, Kadiyala, Kishore wrote:
>While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
>are not getting detected some times.
>
>During reset of command/data line, wrong pointer to base address
>was passed while read operation to SYSCTL register, thus impacting
>the updated reset logic.
>Passing correct base address fixes the issue.
>
>Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>Acked-by: Felipie Balbi <balbi@ti.com>

you got it wrong, here's the correct one :-)

Acked-by: Felipe Balbi <balbi@ti.com>

>Cc: Tony Lindgren <tony@atomide.com>
>Cc: Chris Ball   <cjb@laptop.org>
>Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
>---
> drivers/mmc/host/omap_hsmmc.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
>index 82a1079..5d46021 100644
>--- a/drivers/mmc/host/omap_hsmmc.c
>+++ b/drivers/mmc/host/omap_hsmmc.c
>@@ -1002,7 +1002,7 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host
>*host,
> 	 * Monitor a 0->1 transition first
> 	 */
> 	if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
>-		while ((!(OMAP_HSMMC_READ(host, SYSCTL) & bit))
>+		while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
> 					&& (i++ < limit))
> 			cpu_relax();
> 	}
>-- 
>1.7.1
>
>
>--
>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

-- 
balbi

RE: omap4: hsmmc: Fix improper card detection while booting

[Madhusudhan]

> -----Original Message-----
> From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc-
> owner@vger.kernel.org] On Behalf Of kishore kadiyala
> Sent: Monday, November 15, 2010 3:09 AM
> To: linux-mmc@vger.kernel.org; linux-omap@vger.kernel.org
> Subject: omap4: hsmmc: Fix improper card detection while booting
> 
> While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
> are not getting detected some times.
> 
> During reset of command/data line, wrong pointer to base address
> was passed while read operation to SYSCTL register, thus impacting
> the updated reset logic.
> Passing correct base address fixes the issue.
> 
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> Acked-by: Felipie Balbi <balbi@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Chris Ball   <cjb@laptop.org>
> Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
> ---
>  drivers/mmc/host/omap_hsmmc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 82a1079..5d46021 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1002,7 +1002,7 @@ static inline void
> omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host
> *host,
>  	 * Monitor a 0->1 transition first
>  	 */
>  	if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
> -		while ((!(OMAP_HSMMC_READ(host, SYSCTL) & bit))
> +		while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
>  					&& (i++ < limit))
>  			cpu_relax();
>  	}
> --
> 1.7.1
> 
Ack.

Acked-by: Madhusudhan Chikkature <madhu.cr@ti.com>

> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: omap4: hsmmc: Fix improper card detection while booting

[Tony Lindgren]

* kishore kadiyala <kishore.kadiyala@ti.com> [101115 00:59]:
> While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
> are not getting detected some times.
> 
> During reset of command/data line, wrong pointer to base address
> was passed while read operation to SYSCTL register, thus impacting
> the updated reset logic.
> Passing correct base address fixes the issue.
> 
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> Acked-by: Felipie Balbi <balbi@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Chris Ball   <cjb@laptop.org>
> Cc: Madhusudhan Chikkature <madhu.cr@ti.com>

Good find:

Acked-by: Tony Lindgren <tony@atomide.com>

> ---
>  drivers/mmc/host/omap_hsmmc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 82a1079..5d46021 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1002,7 +1002,7 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host
> *host,
>  	 * Monitor a 0->1 transition first
>  	 */
>  	if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
> -		while ((!(OMAP_HSMMC_READ(host, SYSCTL) & bit))
> +		while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
>  					&& (i++ < limit))
>  			cpu_relax();
>  	}
> -- 
> 1.7.1
> 
> 
> --
> 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

Re: omap4: hsmmc: Fix improper card detection while booting

[Chris Ball]

Hi Kishore,

On Mon, Nov 15, 2010 at 02:38:59PM +0530, kishore kadiyala wrote:
> While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
> are not getting detected some times.
> 
> During reset of command/data line, wrong pointer to base address
> was passed while read operation to SYSCTL register, thus impacting
> the updated reset logic.
> Passing correct base address fixes the issue.
> 
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>

Thanks, I've taken this into the MMC for-linus branch for .37 now.

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child