Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754942Ab3C0I6y (ORCPT ); Wed, 27 Mar 2013 04:58:54 -0400 Received: from mga01.intel.com ([192.55.52.88]:51813 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753633Ab3C0I6t (ORCPT ); Wed, 27 Mar 2013 04:58:49 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,917,1355126400"; d="scan'208";a="309058126" From: Andy Shevchenko To: "Rafael J . Wysocki" , Mika Westerberg , Viresh Kumar , linux-kernel@vger.kernel.org, spear-devel , Vinod Koul , linux-acpi@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH 2/6] dmaengine: call acpi_dma_request_slave_channel as well Date: Wed, 27 Mar 2013 10:57:58 +0200 Message-Id: <1364374682-8547-3-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 1.8.2.rc0.22.gb3600c3 In-Reply-To: <1364374682-8547-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1364374682-8547-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1447 Lines: 43 The slave device could be enumerated by ACPI. In that case the dma_request_slave_channel should use the acpi_dma_request_slave_channel() helper. Signed-off-by: Andy Shevchenko Reviewed-by: Mika Westerberg Acked-by: Rafael J. Wysocki --- drivers/dma/dmaengine.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 2cbfefe..8bbd6aa 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -62,6 +62,8 @@ #include #include #include +#include +#include #include static DEFINE_MUTEX(dma_list_mutex); @@ -561,6 +563,10 @@ struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name) if (dev->of_node) return of_dma_request_slave_channel(dev->of_node, name); + /* If device was enumerated by ACPI get slave info from here */ + if (ACPI_HANDLE(dev)) + return acpi_dma_request_slave_chan_by_name(dev, name); + return NULL; } EXPORT_SYMBOL_GPL(dma_request_slave_channel); -- 1.8.2.rc0.22.gb3600c3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/