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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull one more ARM SoC fix from Olof Johansson:
"I missed one pull request from Samsung with one fix in the previous
batch. Here it is -- a dma driver fix for an early version of silicon
that they still support."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC

+4
+3
arch/arm/mach-exynos/dma.c
··· 275 275 exynos_pdma1_pdata.nr_valid_peri = 276 276 ARRAY_SIZE(exynos4210_pdma1_peri); 277 277 exynos_pdma1_pdata.peri_id = exynos4210_pdma1_peri; 278 + 279 + if (samsung_rev() == EXYNOS4210_REV_0) 280 + exynos_mdma1_device.res.start = EXYNOS4_PA_S_MDMA1; 278 281 } else if (soc_is_exynos4212() || soc_is_exynos4412()) { 279 282 exynos_pdma0_pdata.nr_valid_peri = 280 283 ARRAY_SIZE(exynos4212_pdma0_peri);
+1
arch/arm/mach-exynos/include/mach/map.h
··· 90 90 91 91 #define EXYNOS4_PA_MDMA0 0x10810000 92 92 #define EXYNOS4_PA_MDMA1 0x12850000 93 + #define EXYNOS4_PA_S_MDMA1 0x12840000 93 94 #define EXYNOS4_PA_PDMA0 0x12680000 94 95 #define EXYNOS4_PA_PDMA1 0x12690000 95 96 #define EXYNOS5_PA_MDMA0 0x10800000