public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits
@ 2013-07-15 13:44 Dirk Behme
  2013-07-16 14:57 ` Stefano Babic
  2013-07-17  0:10 ` [U-Boot] " Andy Fleming
  0 siblings, 2 replies; 3+ messages in thread
From: Dirk Behme @ 2013-07-15 13:44 UTC (permalink / raw)
  To: u-boot

Dealing with the sys ctrl register should touch only the
relevant bits and not accidently the whole register. On i.MX6,
the sys control register contains bits which shouldn't be reset to
0, e.g. SYS_CTRL[3-0] and IPP_RST_N (SYS_CTRL[23]).

Do this by read/modify/write instead of just a 32bit write.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
---
 drivers/mmc/fsl_esdhc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 973b19f..431dac2 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -470,7 +470,7 @@ static int esdhc_init(struct mmc *mmc)
 	int timeout = 1000;
 
 	/* Reset the entire host controller */
-	esdhc_write32(&regs->sysctl, SYSCTL_RSTA);
+	esdhc_setbits32(&regs->sysctl, SYSCTL_RSTA);
 
 	/* Wait until the controller is available */
 	while ((esdhc_read32(&regs->sysctl) & SYSCTL_RSTA) && --timeout)
@@ -481,7 +481,7 @@ static int esdhc_init(struct mmc *mmc)
 	esdhc_write32(&regs->scr, 0x00000040);
 #endif
 
-	esdhc_write32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
+	esdhc_setbits32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
 
 	/* Set the initial clock speed */
 	mmc_set_clock(mmc, 400000);
@@ -515,7 +515,7 @@ static void esdhc_reset(struct fsl_esdhc *regs)
 	unsigned long timeout = 100; /* wait max 100 ms */
 
 	/* reset the controller */
-	esdhc_write32(&regs->sysctl, SYSCTL_RSTA);
+	esdhc_setbits32(&regs->sysctl, SYSCTL_RSTA);
 
 	/* hardware clears the bit when it is done */
 	while ((esdhc_read32(&regs->sysctl) & SYSCTL_RSTA) && --timeout)
-- 
1.8.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits
  2013-07-15 13:44 [U-Boot] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits Dirk Behme
@ 2013-07-16 14:57 ` Stefano Babic
  2013-07-17  0:10 ` [U-Boot] " Andy Fleming
  1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2013-07-16 14:57 UTC (permalink / raw)
  To: u-boot

On 15/07/2013 15:44, Dirk Behme wrote:
> Dealing with the sys ctrl register should touch only the
> relevant bits and not accidently the whole register. On i.MX6,
> the sys control register contains bits which shouldn't be reset to
> 0, e.g. SYS_CTRL[3-0] and IPP_RST_N (SYS_CTRL[23]).
> 
> Do this by read/modify/write instead of just a 32bit write.
> 
> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
> ---
>  drivers/mmc/fsl_esdhc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
> index 973b19f..431dac2 100644
> --- a/drivers/mmc/fsl_esdhc.c
> +++ b/drivers/mmc/fsl_esdhc.c
> @@ -470,7 +470,7 @@ static int esdhc_init(struct mmc *mmc)
>  	int timeout = 1000;
>  
>  	/* Reset the entire host controller */
> -	esdhc_write32(&regs->sysctl, SYSCTL_RSTA);
> +	esdhc_setbits32(&regs->sysctl, SYSCTL_RSTA);
>  
>  	/* Wait until the controller is available */
>  	while ((esdhc_read32(&regs->sysctl) & SYSCTL_RSTA) && --timeout)
> @@ -481,7 +481,7 @@ static int esdhc_init(struct mmc *mmc)
>  	esdhc_write32(&regs->scr, 0x00000040);
>  #endif
>  
> -	esdhc_write32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
> +	esdhc_setbits32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
>  
>  	/* Set the initial clock speed */
>  	mmc_set_clock(mmc, 400000);
> @@ -515,7 +515,7 @@ static void esdhc_reset(struct fsl_esdhc *regs)
>  	unsigned long timeout = 100; /* wait max 100 ms */
>  
>  	/* reset the controller */
> -	esdhc_write32(&regs->sysctl, SYSCTL_RSTA);
> +	esdhc_setbits32(&regs->sysctl, SYSCTL_RSTA);
>  
>  	/* hardware clears the bit when it is done */
>  	while ((esdhc_read32(&regs->sysctl) & SYSCTL_RSTA) && --timeout)
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [U-Boot] fsl_esdhc: Touch only relevant sys ctrl bits
  2013-07-15 13:44 [U-Boot] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits Dirk Behme
  2013-07-16 14:57 ` Stefano Babic
@ 2013-07-17  0:10 ` Andy Fleming
  1 sibling, 0 replies; 3+ messages in thread
From: Andy Fleming @ 2013-07-17  0:10 UTC (permalink / raw)
  To: u-boot

On Mon, Jul 15, 2013 at 03:44:29PM +0200, Dirk Behme wrote:
> Dealing with the sys ctrl register should touch only the
> relevant bits and not accidently the whole register. On i.MX6,
> the sys control register contains bits which shouldn't be reset to
> 0, e.g. SYS_CTRL[3-0] and IPP_RST_N (SYS_CTRL[23]).
> 
> Do this by read/modify/write instead of just a 32bit write.
> 
> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
> Acked-by: Stefano Babic <sbabic@denx.de>

Applied, thanks!

Andy

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-17  0:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-15 13:44 [U-Boot] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits Dirk Behme
2013-07-16 14:57 ` Stefano Babic
2013-07-17  0:10 ` [U-Boot] " Andy Fleming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox