From patchwork Tue Jul 17 07:03:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 1203401 Return-Path: X-Original-To: patchwork-linux-omap@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 7A83FDF25A for ; Tue, 17 Jul 2012 07:04:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751109Ab2GQHEJ (ORCPT ); Tue, 17 Jul 2012 03:04:09 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:46500 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014Ab2GQHEI (ORCPT ); Tue, 17 Jul 2012 03:04:08 -0400 Received: by wibhm11 with SMTP id hm11so3438249wib.1 for ; Tue, 17 Jul 2012 00:04:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=ub+NXUIM0zk0f9IZFNvOjeCGvbw/3ZWFVo/zesrAUfg=; b=DRLIGhZDKd8WZgyUZIOVMN2N0y8iW9tw5Vr50NhghvuX66Gpf3RTMwnOfLaDLOq2gz 525g7JnYrrR5YOLukkIV2rXxTDXakNK0yMr7OzcufzRb03FtiGRaXIrUvBQ6T8nI+nEh xaZ4C1CQeDwenOMjUWUqVEAM2iw8EvoTUrEhu2eq9Q7riBTlfeG2WcebkOsGslOEfvtN vPBoeWXdSFXDl8Pi5MXGvLWyi2u9L43jP9QB7/QOPjNbvpkGmA2UH/rMvXe95U/w9v6M eQ/kU30iZ6KM/f9YFb7lB8xhv9BV8kKIstHCTfxWXxFuBMEa5d/q19y62KqhY3kBqYtd hzTg== Received: by 10.216.7.70 with SMTP id 48mr686430weo.40.1342508645739; Tue, 17 Jul 2012 00:04:05 -0700 (PDT) Received: from localhost.localdomain (37.235.79.188.dynamic.jazztel.es. [188.79.235.37]) by mx.google.com with ESMTPS id el6sm25607507wib.8.2012.07.17.00.04.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 00:04:04 -0700 (PDT) From: Javier Martinez Canillas To: Tony Lindgren Cc: Kevin Hilman , Russell King , Santosh Shilimkar , linux-omap@vger.kernel.org, Chris Ball , linux-mmc@vger.kernel.org, Javier Martinez Canillas Subject: [PATCH v2 1/1] mmc: host: enable OMAP DMA engine support for omap hosts by default Date: Tue, 17 Jul 2012 09:03:56 +0200 Message-Id: <1342508636-2782-1-git-send-email-javier@dowhile0.org> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQkDUkogYHfSJoxrwFF7Fx+sJZK7qqXqj+wbJ4CZ1ocm/Fampv1eVtlGsyZMkFHDyeR/JZ6E Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The OMAP MMC and OMAP High Speed MMC hosts now use entirely the DMA engine API instead of the previous private DMA API implementation. So, if the kernel is built with support for any of these hosts but it doesn't support DMA devices nor OMAP DMA support, it fails when trying to obtain a DMA channel which leads to the following error on an OMAP3 IGEPv2 Rev.C board (and probably on most OMAP boards with MMC support): [ 2.199981] omap_hsmmc omap_hsmmc.1: unable to obtain RX DMA engine channel 48 [ 2.215087] omap_hsmmc omap_hsmmc.0: unable to obtain RX DMA engine channel 62 selecting automatically CONFIG_DMADEVICES and CONFIG_DMA_OMAP solves it. While being there, also update drivers/spi/spi-omap2-mcspi which has been ported to DMA engine API too. Signed-off-by: Javier Martinez Canillas Acked-by: Santosh Shilimkar --- Changes since v1: - Also include drivers/spi/spi-omap2-mcspi.c as suggested by Santosh Shilimkar. drivers/mmc/host/Kconfig | 4 ++++ drivers/spi/Kconfig | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index aa131b3..fcddbaf 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -233,6 +233,8 @@ config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP select TPS65010 if MACH_OMAP_H2 + select DMADEVICES + select DMA_OMAP help This selects the TI OMAP Multimedia card Interface. If you have an OMAP board with a Multimedia Card slot, @@ -243,6 +245,8 @@ config MMC_OMAP config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 + select DMADEVICES + select DMA_OMAP help This selects the TI OMAP High Speed Multimedia card Interface. If you have an OMAP2430 or OMAP3 board or OMAP4 board with a diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index cd2fe35..3b7ced3 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -238,6 +238,8 @@ config SPI_OMAP_UWIRE config SPI_OMAP24XX tristate "McSPI driver for OMAP" depends on ARCH_OMAP2PLUS + select DMADEVICES + select DMA_OMAP help SPI master controller for OMAP24XX and later Multichannel SPI (McSPI) modules.