From patchwork Wed Aug 8 12:54:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10582 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 60C2923E00 for ; Wed, 8 Aug 2012 12:55:07 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 30F6AA185A1 for ; Wed, 8 Aug 2012 12:55:07 +0000 (UTC) Received: by ghbg10 with SMTP id g10so706807ghb.11 for ; Wed, 08 Aug 2012 05:55:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=Y0ZiXvjw5amXIhgJ/v0cqAmkTi89hUqFHCstCXUPLiI=; b=SWLyW52H2raifoucjFYSuXjEcPZI7XvVb7Dk4RKRwTOI7UdtBq1K7oHiZZMyfjrKTL n11L8Bn7V+zv6ALw2Z3ULD/7RGCOaNJD+UP7E4Mcw9oydoCrH4Q0CL78AqPiQSalNN+9 nunyiFYspt+H4TM6ghBn9viFeb6fPPKUERBw1W5UTwbw1GzTum0o3JvEoTsJoj7FjLyP COGe1Gwvu88GUXVFwH4tCmKA8j2pKm85fQpSdl937DFPAYp0oWjJBaKndkqWOnzrxVsx mZHDPq1y6NzhSX02aCpV6gpza2XSQTAWCL6wu7bnrLeWXNwLLVpS9M2tWucQO+ME9HUI nUIg== Received: by 10.50.181.136 with SMTP id dw8mr808930igc.31.1344430506014; Wed, 08 Aug 2012 05:55:06 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp605838igc; Wed, 8 Aug 2012 05:55:05 -0700 (PDT) Received: by 10.216.65.202 with SMTP id f52mr8556159wed.206.1344430504576; Wed, 08 Aug 2012 05:55:04 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTP id o4si6236301wiy.43.2012.08.08.05.55.03; Wed, 08 Aug 2012 05:55:04 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MGmAP-1Suwuy2mpd-00E9Ur; Wed, 08 Aug 2012 14:55:02 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Shawn Guo , Sascha Hauer Subject: [PATCH 6/6] ARM: imx: gpmi-nand depends on mxs-dma Date: Wed, 8 Aug 2012 14:54:53 +0200 Message-Id: <1344430493-5304-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344430493-5304-1-git-send-email-arnd@arndb.de> References: <1344430493-5304-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:Lw1yWhdKZwFCJlJUcV61xs3WARbGeXO4zXB8ph3Lri7 l5yxoDOZfCaatsxdBqopR1dD1yCr6SUw3nC9abQ+gksSoxLaeF gpXtSr3lGLOpigMNVejFbYPQIJO70h7QpQKs7kXA1RHzP+TxSh nF0cdDLRcqW44FcUe7C9hYZmDdXXKXMkXcCAzo5YFx0T+Mb+AV GZonQwTBUYPmD6nA27jO3aqLJz9wzxlqeT+vds060GvWt0KtAC BsXMGZ+hzg+KzBkdIw0h5GDlZh3rgs4JrFUAK8ZegwdTsIazKB oT85Vcko9FA4UqZrd67ZyzTG2l00SZlMEkLhYpYwvBm7NLWgJ6 AosxlTGU+rlKeLOtESpuj4AywdWuKVaELWgjdRScjAeSvl4UmU zlbbuMFfEEt9Q== X-Gm-Message-State: ALoCoQmVBdp138xbvHQ8qGGYgyzcxP2xJePehbbbdb0mr3N46PrILOgiaOAq9VWKbeTecFz+F9Fb It is not currently possible to build the gpmi-nand driver without also building the mxs-dma driver. Clarify this Kconfig and enable both in the defconfig file so we can build it again with both enabled. drivers/built-in.o: In function `gpmi_dma_filter': clk-fixed-factor.c:(.text+0xafc18): undefined reference to `mxs_dma_is_apbh' make[1]: *** [vmlinux] Error 1 make: *** [sub-make] Error 2 Signed-off-by: Arnd Bergmann Cc: Shawn Guo Cc: Sascha Hauer --- arch/arm/configs/imx_v6_v7_defconfig | 1 + drivers/mtd/nand/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index f725b96..3c9f32f 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -192,6 +192,7 @@ CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_DMADEVICES=y CONFIG_IMX_SDMA=y +CONFIG_MXS_DMA=y CONFIG_COMMON_CLK_DEBUG=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 31bb7e5..8ca4176 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -480,7 +480,7 @@ config MTD_NAND_NANDSIM config MTD_NAND_GPMI_NAND bool "GPMI NAND Flash Controller driver" - depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q) + depends on MTD_NAND && MXS_DMA help Enables NAND Flash support for IMX23 or IMX28. The GPMI controller is very powerful, with the help of BCH