From patchwork Wed Nov 8 16:29:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10048805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9D1F60381 for ; Wed, 8 Nov 2017 16:30:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D148F2A6EE for ; Wed, 8 Nov 2017 16:30:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4D3A2A731; Wed, 8 Nov 2017 16:30:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D4112A6EE for ; Wed, 8 Nov 2017 16:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693AbdKHQa0 (ORCPT ); Wed, 8 Nov 2017 11:30:26 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36058 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752772AbdKHQ3w (ORCPT ); Wed, 8 Nov 2017 11:29:52 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 73D976071F; Wed, 8 Nov 2017 16:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1510158591; bh=H24fsdMsuygg1MTslKR0u/1W3myTNYnVd/TXzY3TJvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kj1cEJ5txDWlw10kqtM52KoAIhG7ZqHr1PiLk+OZpFTc84N9fvlwHoXxBnDfqt2vz lMD4q1u8IUm5wWAUg7pTdURzF37mhawQ2HB2uJ1QgCzpGrN7FswUbw14vmBKjc5jSX J3xhVnFvgKPvLvuBKBDdaqYBsL1q/3P85Eb+Lx8E= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 690A6601CF; Wed, 8 Nov 2017 16:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1510158591; bh=H24fsdMsuygg1MTslKR0u/1W3myTNYnVd/TXzY3TJvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kj1cEJ5txDWlw10kqtM52KoAIhG7ZqHr1PiLk+OZpFTc84N9fvlwHoXxBnDfqt2vz lMD4q1u8IUm5wWAUg7pTdURzF37mhawQ2HB2uJ1QgCzpGrN7FswUbw14vmBKjc5jSX J3xhVnFvgKPvLvuBKBDdaqYBsL1q/3P85Eb+Lx8E= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 690A6601CF Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: dmaengine@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , linux-kernel@vger.kernel.org Subject: [PATCH V2 2/3] dmaengine: qcom_hidma: add support for the new revision Date: Wed, 8 Nov 2017 11:29:41 -0500 Message-Id: <1510158582-5343-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1510158582-5343-1-git-send-email-okaya@codeaurora.org> References: <1510158582-5343-1-git-send-email-okaya@codeaurora.org> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for probing the newer HW and also organize MSI capable hardware into an array for maintenance reasons. Signed-off-by: Sinan Kaya --- drivers/dma/qcom/hidma.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index e366985..4ef7d6f 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -104,6 +105,26 @@ static void hidma_free(struct hidma_dev *dmadev) module_param(nr_desc_prm, uint, 0644); MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)"); +#define HIDMA_MAX_DEV_MATCH 10 + +struct hidma_cap { + const struct of_device_id of[HIDMA_MAX_DEV_MATCH]; + const struct acpi_device_id acpi[HIDMA_MAX_DEV_MATCH]; +}; + +static struct hidma_cap hidma_msi_cap = { + .of = { + {.compatible = "qcom,hidma-1.1",}, + {.compatible = "qcom,hidma-1.2",}, + {}, + }, + + .acpi = { + {"QCOM8062"}, + {"QCOM8063"}, + {}, + } +}; /* process completed descriptors */ static void hidma_process_completed(struct hidma_chan *mchan) @@ -739,22 +760,16 @@ static int hidma_request_msi(struct hidma_dev *dmadev, static bool hidma_msi_capable(struct device *dev) { struct acpi_device *adev = ACPI_COMPANION(dev); - const char *of_compat; - int ret = -EINVAL; - - if (!adev || acpi_disabled) { - ret = device_property_read_string(dev, "compatible", - &of_compat); - if (ret) - return false; + int ret; - ret = strcmp(of_compat, "qcom,hidma-1.1"); - } else { + if (!adev || acpi_disabled) + ret = of_match_device(hidma_msi_cap.of, dev) != NULL; + else { #ifdef CONFIG_ACPI - ret = strcmp(acpi_device_hid(adev), "QCOM8062"); + ret = acpi_match_device(hidma_msi_cap.acpi, dev) != NULL; #endif } - return ret == 0; + return ret; } static int hidma_probe(struct platform_device *pdev) @@ -954,6 +969,7 @@ static int hidma_remove(struct platform_device *pdev) static const struct acpi_device_id hidma_acpi_ids[] = { {"QCOM8061"}, {"QCOM8062"}, + {"QCOM8063"}, {}, }; MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids); @@ -962,6 +978,7 @@ static int hidma_remove(struct platform_device *pdev) static const struct of_device_id hidma_match[] = { {.compatible = "qcom,hidma-1.0",}, {.compatible = "qcom,hidma-1.1",}, + {.compatible = "qcom,hidma-1.2",}, {}, }; MODULE_DEVICE_TABLE(of, hidma_match);