diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
| commit | 25fbe5ca4d0f37170451b682bd150a70f944aca0 (patch) | |
| tree | c23f80847119d9f297206a37af2ad548ccdde802 /arch/arm/boot/compressed/mmcif-sh7372.c | |
| parent | ff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 (diff) | |
| download | kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.zip kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.gz kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.bz2 | |
update other arm platforms from 3.2.72 and also merge some general arm code (boot)
Diffstat (limited to 'arch/arm/boot/compressed/mmcif-sh7372.c')
| -rw-r--r-- | arch/arm/boot/compressed/mmcif-sh7372.c | 4 |
1 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 7453c83..672ae95 100644 --- a/arch/arm/boot/compressed/mmcif-sh7372.c +++ b/arch/arm/boot/compressed/mmcif-sh7372.c @@ -40,7 +40,7 @@ * to an MMC card * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1 */ -asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len) +asmlinkage void mmc_loader(unsigned char *buf, unsigned long len) { mmc_init_progress(); mmc_update_progress(MMC_PROGRESS_ENTER); @@ -82,7 +82,7 @@ asmlinkage void mmcif_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); } |