From patchwork Thu May 10 16:13:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Austin Christ X-Patchwork-Id: 10392047 X-Patchwork-Delegate: agross@codeaurora.org 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 98B206053D for ; Thu, 10 May 2018 16:15:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84BBA28BD9 for ; Thu, 10 May 2018 16:15:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73DAE289FB; Thu, 10 May 2018 16:15:13 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 D99AF28541 for ; Thu, 10 May 2018 16:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935410AbeEJQOF (ORCPT ); Thu, 10 May 2018 12:14:05 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55804 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964892AbeEJQOE (ORCPT ); Thu, 10 May 2018 12:14:04 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7BB8760A00; Thu, 10 May 2018 16:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968844; bh=nk91uvdvUPlih+aHZJzcdqZW1gyi3l4ELR0zz5pruGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ir2NkBFMRGA9V1gMGOkiwLGd09Jl7m0n0ccSE0R8A61R59J3G3gKnrDnontFutDuJ /SuWjcf5SLcWX1hmU6t/eqQQ4l+SO8SlFasndrWFwzirQUMFTUktbMJdDaSYRsokov Is8Ufrlu7KuZ1iiCoonVlmGiodq61Kyy0Q392/BQ= Received: from austinwc-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: austinwc@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 9668A6081B; Thu, 10 May 2018 16:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968843; bh=nk91uvdvUPlih+aHZJzcdqZW1gyi3l4ELR0zz5pruGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hsPqNYrvT2of8Ja0blsaOr2gzy1AxPlPVCogeq9um1zadGyicQsGtAPko1y+jblZU uNYmli+8o306BWZpz0J3BcExpy6sxcTjoSUXh/nKTgYGHX4k0pP8ulQwfoXZECJ6M5 VQPBuwT2CaKx8jFloCMltYTr81wAmz7Mx9MhFm/o= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9668A6081B 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=austinwc@codeaurora.org From: Austin Christ To: wsa@the-dreams.de, linux-i2c@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, sricharan@codeaurora.org, timur@codeaurora.org, rruigrok@codeaurora.org, andy.gross@linaro.org, david.brown@linaro.org, Austin Christ Subject: [PATCH v3 1/4] i2c: qup: add probe path for Centriq ACPI devices Date: Thu, 10 May 2018 10:13:54 -0600 Message-Id: <1525968837-13381-2-git-send-email-austinwc@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525968837-13381-1-git-send-email-austinwc@codeaurora.org> References: <1525968837-13381-1-git-send-email-austinwc@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for Qualcomm Centriq devices that are qup-v2 compatible but do not support DMA, so nodma needs to be set. Signed-off-by: Austin Christ Reviewed-by: Sricharan R Reviewed-by: Andy Gross --- v1: - Initial v2: - Remove whitespace error v3: - Move branch to QUPv2 segment of probe --- drivers/i2c/busses/i2c-qup.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 904dfec..c024f85 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1648,6 +1648,14 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup) clk_disable_unprepare(qup->pclk); } +#if IS_ENABLED(CONFIG_ACPI) +static const struct acpi_device_id qup_i2c_acpi_match[] = { + { "QCOM8010"}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); +#endif + static int qup_i2c_probe(struct platform_device *pdev) { static const int blk_sizes[] = {4, 16, 32}; @@ -1682,7 +1690,10 @@ static int qup_i2c_probe(struct platform_device *pdev) } else { qup->adap.algo = &qup_i2c_algo_v2; is_qup_v1 = false; - ret = qup_i2c_req_dma(qup); + if (acpi_match_device(qup_i2c_acpi_match, qup->dev)) + goto nodma; + else + ret = qup_i2c_req_dma(qup); if (ret == -EPROBE_DEFER) goto fail_dma; @@ -1959,14 +1970,6 @@ static int qup_i2c_resume(struct device *device) }; MODULE_DEVICE_TABLE(of, qup_i2c_dt_match); -#if IS_ENABLED(CONFIG_ACPI) -static const struct acpi_device_id qup_i2c_acpi_match[] = { - { "QCOM8010"}, - { }, -}; -MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); -#endif - static struct platform_driver qup_i2c_driver = { .probe = qup_i2c_probe, .remove = qup_i2c_remove,