* [PATCH] mmc: sdhi, mmcif: zboot: Correct clock disable logic
@ 2011-08-03 6:08 Simon Horman
2011-08-08 7:38 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2011-08-03 6:08 UTC (permalink / raw)
To: linux-sh
This corrects a logic-error that I made in the original implementation.
An alternate patch would be to just remove these lines and
leave the clock running as it is reconfigured later on during
boot anyway.
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/boot/compressed/mmcif-sh7372.c | 2 +-
arch/arm/boot/compressed/sdhi-sh7372.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/compressed/mmcif-sh7372.c b/arch/arm/boot/compressed/mmcif-sh7372.c
index b6f61d9..672ae95 100644
--- a/arch/arm/boot/compressed/mmcif-sh7372.c
+++ b/arch/arm/boot/compressed/mmcif-sh7372.c
@@ -82,7 +82,7 @@ asmlinkage void mmc_loader(unsigned char *buf, unsigned long len)
/* Disable clock to MMC hardware block */
- __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3);
+ __raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3);
mmc_update_progress(MMC_PROGRESS_DONE);
}
diff --git a/arch/arm/boot/compressed/sdhi-sh7372.c b/arch/arm/boot/compressed/sdhi-sh7372.c
index d403a8b..d279294 100644
--- a/arch/arm/boot/compressed/sdhi-sh7372.c
+++ b/arch/arm/boot/compressed/sdhi-sh7372.c
@@ -85,7 +85,7 @@ asmlinkage void mmc_loader(unsigned short *buf, unsigned long len)
goto err;
/* Disable clock to SDHI1 hardware block */
- __raw_writel(__raw_readl(SMSTPCR3) & (1 << 13), SMSTPCR3);
+ __raw_writel(__raw_readl(SMSTPCR3) | (1 << 13), SMSTPCR3);
mmc_update_progress(MMC_PROGRESS_DONE);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: sdhi, mmcif: zboot: Correct clock disable logic
2011-08-03 6:08 [PATCH] mmc: sdhi, mmcif: zboot: Correct clock disable logic Simon Horman
@ 2011-08-08 7:38 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-08-08 7:38 UTC (permalink / raw)
To: linux-sh
On Wed, Aug 03, 2011 at 03:08:54PM +0900, Simon Horman wrote:
> This corrects a logic-error that I made in the original implementation.
>
> An alternate patch would be to just remove these lines and
> leave the clock running as it is reconfigured later on during
> boot anyway.
>
> Signed-off-by: Simon Horman <horms@verge.net.au>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-08 7:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 6:08 [PATCH] mmc: sdhi, mmcif: zboot: Correct clock disable logic Simon Horman
2011-08-08 7:38 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox