Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45aaff06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 26d29d06 c667f757

arch/arm/mach-exynos/dma.c

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ static int __init exynos_dma_init(void) 
		exynos_pdma1_pdata.nr_valid_peri =

			ARRAY_SIZE(exynos4210_pdma1_peri);

		exynos_pdma1_pdata.peri_id = exynos4210_pdma1_peri;



		if (samsung_rev() == EXYNOS4210_REV_0)

			exynos_mdma1_device.res.start = EXYNOS4_PA_S_MDMA1;

	} else if (soc_is_exynos4212() || soc_is_exynos4412()) {

		exynos_pdma0_pdata.nr_valid_peri =

			ARRAY_SIZE(exynos4212_pdma0_peri);

arch/arm/mach-exynos/include/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 


#define EXYNOS4_PA_MDMA0		0x10810000

#define EXYNOS4_PA_MDMA1		0x12850000

#define EXYNOS4_PA_S_MDMA1		0x12840000

#define EXYNOS4_PA_PDMA0		0x12680000

#define EXYNOS4_PA_PDMA1		0x12690000

#define EXYNOS5_PA_MDMA0		0x10800000