From patchwork Tue Apr 23 11:00:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 2477121 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 12686DF2E5 for ; Tue, 23 Apr 2013 11:00:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755149Ab3DWLAR (ORCPT ); Tue, 23 Apr 2013 07:00:17 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:48946 "EHLO relmlor4.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755116Ab3DWLAQ (ORCPT ); Tue, 23 Apr 2013 07:00:16 -0400 Received: from relmlir2.idc.renesas.com ([10.200.68.152]) by relmlor4.idc.renesas.com ( SJSMS) with ESMTP id <0MLP000Y9FWEVPA0@relmlor4.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 23 Apr 2013 20:00:14 +0900 (JST) Received: from relmlac1.idc.renesas.com ([10.200.69.21]) by relmlir2.idc.renesas.com ( SJSMS) with ESMTP id <0MLP00K8WFW32E70@relmlir2.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 23 Apr 2013 20:00:14 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 816B480177; Tue, 23 Apr 2013 20:00:06 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 7FD4E80193; Tue, 23 Apr 2013 20:00:06 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id WAF11423; Tue, 23 Apr 2013 20:00:06 +0900 X-IronPort-AV: E=Sophos; i="4.87,532,1363100400"; d="scan'208"; a="125100104" Received: from unknown (HELO [10.161.41.141]) ([10.161.41.141]) by relmlii1.idc.renesas.com with ESMTP; Tue, 23 Apr 2013 20:00:06 +0900 Message-id: <517669B6.7040801@renesas.com> Date: Tue, 23 Apr 2013 20:00:06 +0900 From: "Shimoda, Yoshihiro" User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-version: 1.0 To: Vinod Koul Cc: Guennadi Liakhovetski , Magnus Damm , Paul Mundt , SH-Linux Subject: [PATCH v8 1/2] dma: sh: add Kconfig Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org This patch adds Kconfig in the drivers/dma/sh. This patch also adds a new config "SH_DMAE_BASE" and the "config SH_DMAE" depends on it. Since some drivers (e.g. sh_mmcif.c) depends on shdma-base.c if CONFIG_DMA_ENGINE=y, the "config SH_DMAE_BASE" is set as "bool". Signed-off-by: Yoshihiro Shimoda Acked-by: Kuninori Morimoto --- about v8: - add a new config "SH_DMAE_BASE". - the original config "SH_DMAE" depends on "SH_DMAE_BASE". drivers/dma/Kconfig | 10 +--------- drivers/dma/Makefile | 2 +- drivers/dma/sh/Kconfig | 18 ++++++++++++++++++ drivers/dma/sh/Makefile | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 drivers/dma/sh/Kconfig diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index afe5b19..e992489 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -172,15 +172,7 @@ config TEGRA20_APB_DMA This DMA controller transfers data from memory to peripheral fifo or vice versa. It does not support memory to memory data transfer. - - -config SH_DMAE - tristate "Renesas SuperH DMAC support" - depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE) - depends on !SH_DMA_API - select DMA_ENGINE - help - Enable support for the Renesas SuperH DMA controllers. +source "drivers/dma/sh/Kconfig" config COH901318 bool "ST-Ericsson COH901318 DMA support" diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 268e626..a2b0df5 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_MX3_IPU) += ipu/ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o -obj-$(CONFIG_SH_DMAE) += sh/ +obj-$(CONFIG_SH_DMAE_BASE) += sh/ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ obj-$(CONFIG_IMX_SDMA) += imx-sdma.o diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig new file mode 100644 index 0000000..2407998 --- /dev/null +++ b/drivers/dma/sh/Kconfig @@ -0,0 +1,18 @@ +# +# DMA engine configuration for sh +# + +config SH_DMAE_BASE + bool "Renesas SuperH DMA Engine support" + depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE) + depends on !SH_DMA_API + default y + select DMA_ENGINE + help + Enable support for the Renesas SuperH DMA Engine. + +config SH_DMAE + tristate "Renesas SuperH DMAC support" + depends on SH_DMAE_BASE + help + Enable support for the Renesas SuperH DMA controllers. diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index 54ae957..eceaf46 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_SH_DMAE) += shdma-base.o +obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o obj-$(CONFIG_SH_DMAE) += shdma.o