diff options
author | Qiao Zhou <zhouqiao@marvell.com> | 2013-12-04 20:36:21 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-11 20:33:02 -0500 |
commit | b9f10a10cd56414659724bfb9f8b65499f07d538 (patch) | |
tree | 8a9d9e470123e1b2163d82bae89529959158258d | |
parent | 2473de06b070bdd6c711bac138572ec806d5c53d (diff) |
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/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-mmp/Makefile | 3 | ||||
-rw-r--r-- | drivers/dma/Kconfig | 2 |
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 | |||
136 | help | 136 | help |
137 | Enables support for OTG controller which can be switched to host mode. | 137 | Enables support for OTG controller which can be switched to host mode. |
138 | 138 | ||
139 | config MMP_SRAM | ||
140 | bool | ||
141 | |||
139 | endif | 142 | 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 | |||
7 | # SoC support | 7 | # SoC support |
8 | obj-$(CONFIG_CPU_PXA168) += pxa168.o | 8 | obj-$(CONFIG_CPU_PXA168) += pxa168.o |
9 | obj-$(CONFIG_CPU_PXA910) += pxa910.o | 9 | obj-$(CONFIG_CPU_PXA910) += pxa910.o |
10 | obj-$(CONFIG_CPU_MMP2) += mmp2.o sram.o | 10 | obj-$(CONFIG_CPU_MMP2) += mmp2.o |
11 | obj-$(CONFIG_MMP_SRAM) += sram.o | ||
11 | 12 | ||
12 | ifeq ($(CONFIG_COMMON_CLK), ) | 13 | ifeq ($(CONFIG_COMMON_CLK), ) |
13 | obj-y += clock.o | 14 | 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 | |||
289 | bool "MMP Two-Channel DMA support" | 289 | bool "MMP Two-Channel DMA support" |
290 | depends on ARCH_MMP | 290 | depends on ARCH_MMP |
291 | select DMA_ENGINE | 291 | select DMA_ENGINE |
292 | select MMP_SRAM | ||
292 | help | 293 | help |
293 | Support the MMP Two-Channel DMA engine. | 294 | Support the MMP Two-Channel DMA engine. |
294 | This engine used for MMP Audio DMA and pxa910 SQU. | 295 | This engine used for MMP Audio DMA and pxa910 SQU. |
296 | It needs sram driver under mach-mmp. | ||
295 | 297 | ||
296 | Say Y here if you enabled MMP ADMA, otherwise say N. | 298 | Say Y here if you enabled MMP ADMA, otherwise say N. |
297 | 299 | ||