Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sdhi, mmcif: zboot: Correct clock disable logic

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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Simon Horman and committed by
Paul Mundt
b3623080 b79b3e05

+2 -2
+1 -1
arch/arm/boot/compressed/mmcif-sh7372.c
··· 82 82 83 83 84 84 /* Disable clock to MMC hardware block */ 85 - __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); 85 + __raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3); 86 86 87 87 mmc_update_progress(MMC_PROGRESS_DONE); 88 88 }
+1 -1
arch/arm/boot/compressed/sdhi-sh7372.c
··· 85 85 goto err; 86 86 87 87 /* Disable clock to SDHI1 hardware block */ 88 - __raw_writel(__raw_readl(SMSTPCR3) & (1 << 13), SMSTPCR3); 88 + __raw_writel(__raw_readl(SMSTPCR3) | (1 << 13), SMSTPCR3); 89 89 90 90 mmc_update_progress(MMC_PROGRESS_DONE); 91 91