From patchwork Mon Jul 27 11:53:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 6872701 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA83AC05AC for ; Mon, 27 Jul 2015 11:53:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC648205DC for ; Mon, 27 Jul 2015 11:53:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E95B9205C4 for ; Mon, 27 Jul 2015 11:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbbG0Lxe (ORCPT ); Mon, 27 Jul 2015 07:53:34 -0400 Received: from mga02.intel.com ([134.134.136.20]:24044 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688AbbG0Lxd (ORCPT ); Mon, 27 Jul 2015 07:53:33 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 27 Jul 2015 04:53:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,553,1432623600"; d="scan'208";a="771891522" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.90]) by orsmga002.jf.intel.com with ESMTP; 27 Jul 2015 04:53:32 -0700 Received: from andy by smile with local (Exim 4.86_RC5) (envelope-from ) id 1ZJgyI-00038q-Sl; Mon, 27 Jul 2015 14:53:30 +0300 From: Andy Shevchenko To: Ludovic Desroches , Ulf Hansson , linux-mmc@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 1/1] mmc: atmel-mci: allow DMA transfers for AVR32 Date: Mon, 27 Jul 2015 14:53:30 +0300 Message-Id: <1437998010-12036-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.4.6 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit ecb89f2f5f3e (mmc: atmel-mci: remove compat for non DT board when requesting dma chan) removes compat transfer which breaks DMA support for ATNGW100. This patch returns back that functionality. Cc: Ludovic Desroches Signed-off-by: Andy Shevchenko --- drivers/mmc/host/atmel-mci.c | 49 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9a39e0b..70865be 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2277,12 +2277,55 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot, mmc_free_host(slot->mmc); } -static int atmci_configure_dma(struct atmel_mci *host) +static bool atmci_filter(struct dma_chan *chan, void *pdata) { + struct mci_platform_data *sl_pdata = pdata; + struct mci_dma_data *sl; + + if (!sl_pdata) + return false; + + sl = sl_pdata->dma_slave; + if (sl && find_slave_dev(sl) == chan->device->dev) { + chan->private = slave_data_ptr(sl); + return true; + } else { + return false; + } +} + +static int atmci_dma_request_channel(struct atmel_mci *host) +{ + struct mci_platform_data *pdata; + dma_cap_mask_t mask; + host->dma.chan = dma_request_slave_channel_reason(&host->pdev->dev, "rxtx"); - if (IS_ERR(host->dma.chan)) - return PTR_ERR(host->dma.chan); + if (!IS_ERR(host->dma.chan)) + return 0; + + if (PTR_ERR(host->dma.chan) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + pdata = host->pdev->dev.platform_data; + + dma_cap_zero(mask); + dma_cap_set(DMA_SLAVE, mask); + + host->dma.chan = dma_request_channel(mask, atmci_filter, pdata); + if (!host->dma.chan) + return -ENODEV; + + return 0; +} + +static int atmci_configure_dma(struct atmel_mci *host) +{ + int ret; + + ret = atmci_dma_request_channel(host); + if (ret) + return ret; dev_info(&host->pdev->dev, "using %s for DMA transfers\n", dma_chan_name(host->dma.chan));