xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Browse Source 
Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
This commit is contained in:
Russell King
2011-09-16 21:45:16 +01:00
parent 1db3706b05 4fb0d2ea39
commit 4722cd7741
106 changed files with 1507 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/compressed/mmcif-sh7372.c
View File

@@ -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);
}

2
arch/arm/boot/compressed/sdhi-sh7372.c
View File

@@ -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);