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: "Christ, Austin" X-Patchwork-Id: 911421 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="ir2NkBFM"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="hsPqNYrv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hdZk5sYgz9s1b for ; Fri, 11 May 2018 02:14:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965017AbeEJQOF (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= 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 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-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 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, From patchwork Thu May 10 16:13:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christ, Austin" X-Patchwork-Id: 911422 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="NLCO2ZCT"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="NLCO2ZCT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hdZm4ZjZz9s1w for ; Fri, 11 May 2018 02:14:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966425AbeEJQOH (ORCPT ); Thu, 10 May 2018 12:14:07 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55914 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966026AbeEJQOG (ORCPT ); Thu, 10 May 2018 12:14:06 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DB2BC60767; Thu, 10 May 2018 16:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968845; bh=yAjXe7urUizkCNSc6SOWJyCgo1KfWSEYk03JmV5GdIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NLCO2ZCTIR/FZh87ngdLOgHkFOsTW1quxr2SxpHjCIEoeTiQMRplI6MxAtXIzCq9C /WJjtYgjrgDJIl1O/a9aMLXV6rZ+2/Q35vI3hBC4yvuh9xNGMBExO/pd0IXL4PD8Qn XZkUfPLtcbBBa86Fn2hI1wbP7LaVBn/+fn8IIWXs= 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 326AA60767; 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=1525968845; bh=yAjXe7urUizkCNSc6SOWJyCgo1KfWSEYk03JmV5GdIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NLCO2ZCTIR/FZh87ngdLOgHkFOsTW1quxr2SxpHjCIEoeTiQMRplI6MxAtXIzCq9C /WJjtYgjrgDJIl1O/a9aMLXV6rZ+2/Q35vI3hBC4yvuh9xNGMBExO/pd0IXL4PD8Qn XZkUfPLtcbBBa86Fn2hI1wbP7LaVBn/+fn8IIWXs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 326AA60767 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 2/4] i2c: qup: Add support for Fast Mode Plus Date: Thu, 10 May 2018 10:13:55 -0600 Message-Id: <1525968837-13381-3-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-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Previously the QUP driver limited operation mode to I2C Fast Mode. Add Fast Mode Plus functionality by raising SCL limit from 400kHz to 1MHz. Signed-off-by: Austin Christ Reviewed-by: Sricharan R Reviewed-by: Andy Gross --- v1: - Initial v2: - No changes v3: - No changes --- drivers/i2c/busses/i2c-qup.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index c024f85..ce5f215 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -136,8 +136,13 @@ */ #define TOUT_MIN 2 +/* I2C Frequency Modes */ +#define I2C_STANDARD_FREQ 100000 +#define I2C_FAST_MODE_FREQ 400000 +#define I2C_FAST_MODE_PLUS_FREQ 1000000 + /* Default values. Use these if FW query fails */ -#define DEFAULT_CLK_FREQ 100000 +#define DEFAULT_CLK_FREQ I2C_STANDARD_FREQ #define DEFAULT_SRC_CLK 20000000 /* @@ -1745,8 +1750,8 @@ static int qup_i2c_probe(struct platform_device *pdev) } nodma: - /* We support frequencies up to FAST Mode (400KHz) */ - if (!clk_freq || clk_freq > 400000) { + /* We support frequencies up to FAST Mode Plus (1MHz) */ + if (!clk_freq || clk_freq > I2C_FAST_MODE_PLUS_FREQ) { dev_err(qup->dev, "clock frequency not supported %d\n", clk_freq); return -EINVAL; From patchwork Thu May 10 16:13:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christ, Austin" X-Patchwork-Id: 911423 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="aOqIqEdQ"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="KlJ+B3D4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hdZp2CjSz9s0y for ; Fri, 11 May 2018 02:14:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966026AbeEJQOJ (ORCPT ); Thu, 10 May 2018 12:14:09 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55966 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966299AbeEJQOH (ORCPT ); Thu, 10 May 2018 12:14:07 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 195AA60A00; Thu, 10 May 2018 16:14:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968847; bh=Sbka2yW3XqpwwpFJ+UpunR1Q3/HZjFjT1ny6No12G1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aOqIqEdQ0Hqp7BwZasNwXSQ+0l4JM3w9U8sLBEK/XaGftGUs7KXvVCM7mEoZAIWCu XOrRJXqkKkJQJgqvMq6oAkLBhwVRUa6Xu/FuvURX7LSTgQ4MMEjWGTTmNc1R7IF1ih RDTTKx1hNVZJZC6Rj+BWKSAhfqCGmhcacQ12O+AY= 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 1BED260881; Thu, 10 May 2018 16:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968846; bh=Sbka2yW3XqpwwpFJ+UpunR1Q3/HZjFjT1ny6No12G1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KlJ+B3D4/pSMOCrdb0tmQ8lXYQBUWtlrbn4CEJlJEUtTk7+YMuU1NzOq1hdo4yC7F ExvAQWlx5qDUzoMtD6T+CJACR7n6hiU+rxw/xCBombIgzmWnpA1mdWjEfNYKdLhvqt 9soVSNJKupxP0ZYloK4jCmV0K1sCWtnBa0q+xk9g= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1BED260881 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 3/4] i2c: qup: Correct duty cycle for FM and FM+ Date: Thu, 10 May 2018 10:13:56 -0600 Message-Id: <1525968837-13381-4-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-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The I2C spec UM10204 Rev. 6 specifies the following timings. Standard Fast Mode Fast Mode Plus SCL low 4.7us 1.3us 0.5us SCL high 4.0us 0.6us 0.26us This results in a 33%/66% duty cycle as opposed to the 50%/50% duty cycle used for Standard-mode. Add High Time Divider settings to correct duty cycle for FM(400kHz) and FM+(1MHz). Signed-off-by: Austin Christ Reviewed-by: Sricharan R Reviewed-by: Andy Gross --- v1: - Initial v2: - No changes v3: - No changes --- drivers/i2c/busses/i2c-qup.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index ce5f215..f87f29f 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1855,9 +1855,15 @@ static int qup_i2c_probe(struct platform_device *pdev) size = QUP_INPUT_FIFO_SIZE(io_mode); qup->in_fifo_sz = qup->in_blk_sz * (2 << size); - fs_div = ((src_clk_freq / clk_freq) / 2) - 3; hs_div = 3; - qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff); + if (clk_freq <= I2C_STANDARD_FREQ) { + fs_div = ((src_clk_freq / clk_freq) / 2) - 3; + qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff); + } else { + /* 33%/66% duty cycle */ + fs_div = ((src_clk_freq / clk_freq) - 6) * 2 / 3; + qup->clk_ctl = ((fs_div / 2) << 16) | (hs_div << 8) | (fs_div & 0xff); + } /* * Time it takes for a byte to be clocked out on the bus. From patchwork Thu May 10 16:13: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: 911424 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="gqIAwmhF"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="gqIAwmhF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hdZq5Wfkz9s0y for ; Fri, 11 May 2018 02:14:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966299AbeEJQOK (ORCPT ); Thu, 10 May 2018 12:14:10 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56108 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966443AbeEJQOJ (ORCPT ); Thu, 10 May 2018 12:14:09 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id EBFB760C67; Thu, 10 May 2018 16:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968848; bh=9zeOlLR6S6+XyzWKHZuvSnpFHFsrbXOSHi3WmjWyETo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqIAwmhFY2lnD4BcWaYgGWYn4TgWuNYs0myjIBbg6vnI0POvPhA/0rFRlSjegchcE RLi7hBIulC2cTo6Lwu+am4UqbFS/U/ScTmCGoBlVFmA6V9gZ/uRuIL6L7j1XpgS9kO aIpoBuEISNi4EjIgnnGe1BdAMG5N8mvH6S4gHWsg= 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 B9D2760881; Thu, 10 May 2018 16:14:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525968848; bh=9zeOlLR6S6+XyzWKHZuvSnpFHFsrbXOSHi3WmjWyETo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqIAwmhFY2lnD4BcWaYgGWYn4TgWuNYs0myjIBbg6vnI0POvPhA/0rFRlSjegchcE RLi7hBIulC2cTo6Lwu+am4UqbFS/U/ScTmCGoBlVFmA6V9gZ/uRuIL6L7j1XpgS9kO aIpoBuEISNi4EjIgnnGe1BdAMG5N8mvH6S4gHWsg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B9D2760881 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 4/4] i2c: qup: Add command-line parameter to override SCL frequency Date: Thu, 10 May 2018 10:13:57 -0600 Message-Id: <1525968837-13381-5-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-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add a module parameter to override SCL frequency provided by firmware. This can be useful when testing spec compliance for I2C modes or when debugging issues across multiple operating frequencies. Signed-off-by: Austin Christ Reviewed-by: Sricharan R Reviewed-by: Andy Gross --- v1: - Initial v2: - No changes v3: - No changes --- drivers/i2c/busses/i2c-qup.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index f87f29f..da4cc57 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -155,6 +155,10 @@ /* TAG length for DATA READ in RX FIFO */ #define READ_RX_TAGS_LEN 2 +static unsigned int scl_freq; +module_param_named(scl_freq, scl_freq, uint, 0444); +MODULE_PARM_DESC(scl_freq, "SCL frequency override"); + /* * count: no of blocks * pos: current block number @@ -1682,11 +1686,16 @@ static int qup_i2c_probe(struct platform_device *pdev) init_completion(&qup->xfer); platform_set_drvdata(pdev, qup); - ret = device_property_read_u32(qup->dev, "clock-frequency", &clk_freq); - if (ret) { - dev_notice(qup->dev, "using default clock-frequency %d", - DEFAULT_CLK_FREQ); - } + if (scl_freq) { + dev_notice(qup->dev, "Using override frequency of %u\n", scl_freq); + clk_freq = scl_freq; + } else { + ret = device_property_read_u32(qup->dev, "clock-frequency", &clk_freq); + if (ret) { + dev_notice(qup->dev, "using default clock-frequency %d", + DEFAULT_CLK_FREQ); + } + } if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) { qup->adap.algo = &qup_i2c_algo;