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

Commit 6307e418 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/devel-samsung-dma' of... 

Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

* 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  (includes dependent base of samsung/cleanup-exynos-clock)
parents f3d88244 efd9960b

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config SOC_EXYNOS4212 
	bool "SAMSUNG EXYNOS4212"

	default y

	depends on ARCH_EXYNOS4

	select SAMSUNG_DMADEV

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help
@@ -50,6 +51,7 @@ config SOC_EXYNOS4412 
	bool "SAMSUNG EXYNOS4412"

	default y

	depends on ARCH_EXYNOS4

	select SAMSUNG_DMADEV

	help

	  Enable EXYNOS4412 SoC support
@@ -333,6 +335,7 @@ config MACH_SMDK4212 
	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	select EXYNOS4_DEV_DMA

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C7

arch/arm/mach-exynos/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ obj- := 


# Core



obj-$(CONFIG_ARCH_EXYNOS4)	+= common.o clock.o

obj-$(CONFIG_ARCH_EXYNOS)	+= common.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= clock-exynos4.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o