From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D24AEC433DF for ; Thu, 9 Jul 2020 07:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4BF52070E for ; Thu, 9 Jul 2020 07:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726267AbgGIHla (ORCPT ); Thu, 9 Jul 2020 03:41:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbgGIHl2 (ORCPT ); Thu, 9 Jul 2020 03:41:28 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86DC7C08C5DC for ; Thu, 9 Jul 2020 00:41:28 -0700 (PDT) Received: from heimdall.vpn.pengutronix.de ([2001:67c:670:205:1d::14] helo=blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jtRBM-0000FM-IF; Thu, 09 Jul 2020 09:41:24 +0200 From: Marc Kleine-Budde To: Mark Brown Cc: Nicolas Saenz Julienne , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, linux-spi@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Martin Sperl , Marc Kleine-Budde Subject: [PATCH 2/2] spi: bcm2835aux: support effective_speed_hz Date: Thu, 9 Jul 2020 09:41:20 +0200 Message-Id: <20200709074120.110069-3-mkl@pengutronix.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709074120.110069-1-mkl@pengutronix.de> References: <20200709074120.110069-1-mkl@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:205:1d::14 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-spi@vger.kernel.org Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Martin Sperl Setting spi_transfer->effective_speed_hz in transfer_one so that it can get used in cs_change_delay configured with delay as a muliple of SPI clock cycles. Signed-off-by: Martin Sperl Signed-off-by: Marc Kleine-Budde --- drivers/spi/spi-bcm2835aux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index c331efd6e86b..2f717812c766 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -345,7 +345,7 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master, struct spi_transfer *tfr) { struct bcm2835aux_spi *bs = spi_master_get_devdata(master); - unsigned long spi_hz, clk_hz, speed, spi_used_hz; + unsigned long spi_hz, clk_hz, speed; unsigned long hz_per_byte, byte_limit; /* calculate the registers to handle @@ -374,7 +374,7 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master, /* set the new speed */ bs->cntl[0] |= speed << BCM2835_AUX_SPI_CNTL0_SPEED_SHIFT; - spi_used_hz = clk_hz / (2 * (speed + 1)); + tfr->effective_speed_hz = clk_hz / (2 * (speed + 1)); /* set transmit buffers and length */ bs->tx_buf = tfr->tx_buf; @@ -391,7 +391,7 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master, * 30 µs per 300,000 Hz of bus clock. */ hz_per_byte = polling_limit_us ? (9 * 1000000) / polling_limit_us : 0; - byte_limit = hz_per_byte ? spi_used_hz / hz_per_byte : 1; + byte_limit = hz_per_byte ? tfr->effective_speed_hz / hz_per_byte : 1; /* run in polling mode for short transfers */ if (tfr->len < byte_limit) -- 2.27.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D449C433DF for ; Thu, 9 Jul 2020 07:43:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C35F2070E for ; Thu, 9 Jul 2020 07:43:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="e9Ng2X9z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C35F2070E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PRflInlYcVGEUmeXicaQZqJ9jq6sfaIhr+vtCjEpz1Y=; b=e9Ng2X9zTd0gNd/8KtYnRlnu0 cDIwieU14PvcP7ZAlaAjkGhYxm6ttXEx9B0hWHBfKXalqabbfh5dbcjIu9U6q1qpIVuUYIdq6/XtP nuqt96L40lHbLsIbbSzN9F+8d7U5f3TvXkzYn2QY1cITe/6ZCimdlf53O91AVz+xmF94itSbB8ZQf +Iz2eNk+xWHj9DnQb3vO60puLaGFtdWB3aU6TraLTqQl8xwxvpHxMoGfxLTOMTem6KoPizzDMUsB4 z+hgCVz5h9y5I9O4sgr/oEj5wfEi54iaJG7t3YLBeCps8SYU79Fp5wdtUxKYbtjLwUxu3YhSfvz5c Xxbh4ug9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtRBZ-0004wG-Jw; Thu, 09 Jul 2020 07:41:37 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtRBR-0004tb-Iz for linux-arm-kernel@lists.infradead.org; Thu, 09 Jul 2020 07:41:30 +0000 Received: from heimdall.vpn.pengutronix.de ([2001:67c:670:205:1d::14] helo=blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jtRBM-0000FM-IF; Thu, 09 Jul 2020 09:41:24 +0200 From: Marc Kleine-Budde To: Mark Brown Subject: [PATCH 2/2] spi: bcm2835aux: support effective_speed_hz Date: Thu, 9 Jul 2020 09:41:20 +0200 Message-Id: <20200709074120.110069-3-mkl@pengutronix.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709074120.110069-1-mkl@pengutronix.de> References: <20200709074120.110069-1-mkl@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:205:1d::14 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200709_034129_661125_E835210B X-CRM114-Status: GOOD ( 11.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Florian Fainelli , Scott Branden , Ray Jui , linux-spi@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, kernel@pengutronix.de, Martin Sperl , Marc Kleine-Budde , Nicolas Saenz Julienne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogTWFydGluIFNwZXJsIDxrZXJuZWxAbWFydGluLnNwZXJsLm9yZz4KClNldHRpbmcgc3Bp X3RyYW5zZmVyLT5lZmZlY3RpdmVfc3BlZWRfaHogaW4gdHJhbnNmZXJfb25lIHNvIHRoYXQKaXQg Y2FuIGdldCB1c2VkIGluIGNzX2NoYW5nZV9kZWxheSBjb25maWd1cmVkIHdpdGggZGVsYXkgYXMg YSBtdWxpcGxlCm9mIFNQSSBjbG9jayBjeWNsZXMuCgpTaWduZWQtb2ZmLWJ5OiBNYXJ0aW4gU3Bl cmwgPGtlcm5lbEBtYXJ0aW4uc3Blcmwub3JnPgpTaWduZWQtb2ZmLWJ5OiBNYXJjIEtsZWluZS1C dWRkZSA8bWtsQHBlbmd1dHJvbml4LmRlPgotLS0KIGRyaXZlcnMvc3BpL3NwaS1iY20yODM1YXV4 LmMgfCA2ICsrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3NwaS9zcGktYmNtMjgzNWF1eC5jIGIvZHJpdmVy cy9zcGkvc3BpLWJjbTI4MzVhdXguYwppbmRleCBjMzMxZWZkNmU4NmIuLjJmNzE3ODEyYzc2NiAx MDA2NDQKLS0tIGEvZHJpdmVycy9zcGkvc3BpLWJjbTI4MzVhdXguYworKysgYi9kcml2ZXJzL3Nw aS9zcGktYmNtMjgzNWF1eC5jCkBAIC0zNDUsNyArMzQ1LDcgQEAgc3RhdGljIGludCBiY20yODM1 YXV4X3NwaV90cmFuc2Zlcl9vbmUoc3RydWN0IHNwaV9tYXN0ZXIgKm1hc3RlciwKIAkJCQkgICAg ICAgc3RydWN0IHNwaV90cmFuc2ZlciAqdGZyKQogewogCXN0cnVjdCBiY20yODM1YXV4X3NwaSAq YnMgPSBzcGlfbWFzdGVyX2dldF9kZXZkYXRhKG1hc3Rlcik7Ci0JdW5zaWduZWQgbG9uZyBzcGlf aHosIGNsa19oeiwgc3BlZWQsIHNwaV91c2VkX2h6OworCXVuc2lnbmVkIGxvbmcgc3BpX2h6LCBj bGtfaHosIHNwZWVkOwogCXVuc2lnbmVkIGxvbmcgaHpfcGVyX2J5dGUsIGJ5dGVfbGltaXQ7CiAK IAkvKiBjYWxjdWxhdGUgdGhlIHJlZ2lzdGVycyB0byBoYW5kbGUKQEAgLTM3NCw3ICszNzQsNyBA QCBzdGF0aWMgaW50IGJjbTI4MzVhdXhfc3BpX3RyYW5zZmVyX29uZShzdHJ1Y3Qgc3BpX21hc3Rl ciAqbWFzdGVyLAogCS8qIHNldCB0aGUgbmV3IHNwZWVkICovCiAJYnMtPmNudGxbMF0gfD0gc3Bl ZWQgPDwgQkNNMjgzNV9BVVhfU1BJX0NOVEwwX1NQRUVEX1NISUZUOwogCi0Jc3BpX3VzZWRfaHog PSBjbGtfaHogLyAoMiAqIChzcGVlZCArIDEpKTsKKwl0ZnItPmVmZmVjdGl2ZV9zcGVlZF9oeiA9 IGNsa19oeiAvICgyICogKHNwZWVkICsgMSkpOwogCiAJLyogc2V0IHRyYW5zbWl0IGJ1ZmZlcnMg YW5kIGxlbmd0aCAqLwogCWJzLT50eF9idWYgPSB0ZnItPnR4X2J1ZjsKQEAgLTM5MSw3ICszOTEs NyBAQCBzdGF0aWMgaW50IGJjbTI4MzVhdXhfc3BpX3RyYW5zZmVyX29uZShzdHJ1Y3Qgc3BpX21h c3RlciAqbWFzdGVyLAogCSAqIDMwIMK1cyBwZXIgMzAwLDAwMCBIeiBvZiBidXMgY2xvY2suCiAJ ICovCiAJaHpfcGVyX2J5dGUgPSBwb2xsaW5nX2xpbWl0X3VzID8gKDkgKiAxMDAwMDAwKSAvIHBv bGxpbmdfbGltaXRfdXMgOiAwOwotCWJ5dGVfbGltaXQgPSBoel9wZXJfYnl0ZSA/IHNwaV91c2Vk X2h6IC8gaHpfcGVyX2J5dGUgOiAxOworCWJ5dGVfbGltaXQgPSBoel9wZXJfYnl0ZSA/IHRmci0+ ZWZmZWN0aXZlX3NwZWVkX2h6IC8gaHpfcGVyX2J5dGUgOiAxOwogCiAJLyogcnVuIGluIHBvbGxp bmcgbW9kZSBmb3Igc2hvcnQgdHJhbnNmZXJzICovCiAJaWYgKHRmci0+bGVuIDwgYnl0ZV9saW1p dCkKLS0gCjIuMjcuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2xpbnV4LWFybS1rZXJuZWwK