summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiao Zhou <zhouqiao@marvell.com>2013-12-05 09:36:21 +0800
committerOlof Johansson <olof@lixom.net>2013-12-11 17:33:02 -0800
commitb9f10a10cd56414659724bfb9f8b65499f07d538 (patch)
tree8a9d9e470123e1b2163d82bae89529959158258d
parent2473de06b070bdd6c711bac138572ec806d5c53d (diff)
downloadtalos-obmc-linux-b9f10a10cd56414659724bfb9f8b65499f07d538.tar.gz
talos-obmc-linux-b9f10a10cd56414659724bfb9f8b65499f07d538.zip
ARM: mmp: build sram driver alone
sram driver can be used by many chips besides CPU_MMP2, and so build it alone. Also need to select MMP_SRAM for MMP_TDMA driver. Reported-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Qiao Zhou <zhouqiao@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-mmp/Kconfig3
-rw-r--r--arch/arm/mach-mmp/Makefile3
-rw-r--r--drivers/dma/Kconfig2
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index ebdda8346a26..ebdba87b9671 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -136,4 +136,7 @@ config USB_EHCI_MV_U2O
help
Enables support for OTG controller which can be switched to host mode.
+config MMP_SRAM
+ bool
+
endif
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index 9b702a1dc7b0..98f0f6388e44 100644
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -7,7 +7,8 @@ obj-y += common.o devices.o time.o
# SoC support
obj-$(CONFIG_CPU_PXA168) += pxa168.o
obj-$(CONFIG_CPU_PXA910) += pxa910.o
-obj-$(CONFIG_CPU_MMP2) += mmp2.o sram.o
+obj-$(CONFIG_CPU_MMP2) += mmp2.o
+obj-$(CONFIG_MMP_SRAM) += sram.o
ifeq ($(CONFIG_COMMON_CLK), )
obj-y += clock.o
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 446687cc2334..af3676333da4 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -289,9 +289,11 @@ config MMP_TDMA
bool "MMP Two-Channel DMA support"
depends on ARCH_MMP
select DMA_ENGINE
+ select MMP_SRAM
help
Support the MMP Two-Channel DMA engine.
This engine used for MMP Audio DMA and pxa910 SQU.
+ It needs sram driver under mach-mmp.
Say Y here if you enabled MMP ADMA, otherwise say N.
OpenPOWER on IntegriCloud