From patchwork Wed Apr 4 19:44:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christ, Austin" X-Patchwork-Id: 895126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="NS9S/E2H"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="A5cPfCHr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Gbyz1Mc1z9s0x for ; Thu, 5 Apr 2018 05:45:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751749AbeDDTpL (ORCPT ); Wed, 4 Apr 2018 15:45:11 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55666 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751648AbeDDTpI (ORCPT ); Wed, 4 Apr 2018 15:45:08 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 56736607E5; Wed, 4 Apr 2018 19:45:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522871108; bh=yYk8CTt+N1MkWJVVX827dir/I7ttxIlOPv90SdHlxyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NS9S/E2HWTXR/FO7AdfLsVGEBlxrW8L5qVERXUMkJooVg5LMEKJEftyY2vHAm11zk SKtl3hn9r5EGOphaceB2/sby+oFLxz8bWdEd3s5uPPN1lya7HUyDteJfkHbbHNHYlf DuNmyVjYyvQ1/EiyfFlx8QGjY0w5OrTLW5JhG7d4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 53F3860590; Wed, 4 Apr 2018 19:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522871107; bh=yYk8CTt+N1MkWJVVX827dir/I7ttxIlOPv90SdHlxyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5cPfCHr8QytPEAMz0GeJ2G0oeSZZ6V1drljZBVu42x6dO4QMoYZ5s44L8PHKl8ME CK0BVGIbLWL5nJyTi4r3lC6VJBscbTwePWoSGl62vWn//mIFVKWDN0bQ1FhXEKfI3x GxWGq+lcmXU5S1v56RJfwmw10w7l+suPzUtpUE3w= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 53F3860590 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, linux-arm-msm@vger.kernel.org Cc: rruigrok@codeaurora.org, timur@codeaurora.org, Austin Christ Subject: [PATCH v2 1/4] i2c: qup: add probe path for Centriq ACPI devices Date: Wed, 4 Apr 2018 13:44:57 -0600 Message-Id: <1522871100-3621-2-git-send-email-austinwc@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1522871100-3621-1-git-send-email-austinwc@codeaurora.org> References: <1522871100-3621-1-git-send-email-austinwc@codeaurora.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 --- v1: - Initial v2: - Remove whitespace error --- drivers/i2c/busses/i2c-qup.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 904dfec..80af973 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}; @@ -1675,6 +1683,12 @@ static int qup_i2c_probe(struct platform_device *pdev) DEFAULT_CLK_FREQ); } + if (acpi_match_device(qup_i2c_acpi_match, qup->dev)) { + qup->adap.algo = &qup_i2c_algo_v2; + is_qup_v1 = false; + goto nodma; + } + if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) { qup->adap.algo = &qup_i2c_algo; qup->adap.quirks = &qup_i2c_quirks; @@ -1959,14 +1973,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,