From patchwork Thu Feb 20 14:11:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11394209 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02E48930 for ; Thu, 20 Feb 2020 14:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD8E6206E2 for ; Thu, 20 Feb 2020 14:11:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="V2UZ10xJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726959AbgBTOLx (ORCPT ); Thu, 20 Feb 2020 09:11:53 -0500 Received: from mail-am6eur05on2135.outbound.protection.outlook.com ([40.107.22.135]:22081 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728129AbgBTOLw (ORCPT ); Thu, 20 Feb 2020 09:11:52 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i1Sj7iK9Fr1AxRw8QkO8zlk9xFVusPvBwOGhYNy48Xn6hgHedo1hgAeGLoempbHEdiSRHnNvoWxvnz92JuUzrp+6ymfIKe/rtCHZdpFaYFjKad0W/rG9/JH5KVfZsjOqY0RnfOkl7xCaQz0UgyLnZZAeOrmbS2AY1RnDEbm8UkZqj4nGD9JQewuGZgdSMZ0pHcgwHhjFCcupa5QrBb7WkzoTIyEIn9ks09sA8uod/yy0XhdUjYEHWlcZhfwXCWeWYv6BmEw8p4FD/dYA00s6/SryVdY/dRZy4nBOUy4XTPedRA+ixF4YIWYAOWj0hZj7IPQzIWRt5wsv5iPnkEgUhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q0HzKmSU25apdq1DtcQ2R5UycoFDC5VowhBS3rlYUiE=; b=AKtlouAWHevWmuaDhCtvKE+FgQQJC4RPvfVEMdmd97TQqC7mL8rCY2DgQdbB9w9o+ZwAJ1D65bMwGfFhDtW7n8S568/YGhYD5uSGG1qJV85JczywCk7IoODWlqDQwnCSudIG84W5EqC11K60wE//qzuqFObM8u5Lsu/gPPQ1ucFFl9dl70Jye2+zUp5giLV7VJkVwBtef1Q3YuCR+rFKgzlUzQj1daUEDe8S5zIlMNnMI//LWjFJML7FR5pBahf97k1G6IVjVJNuXrzwLTe5G0lQ5T3pWqdM5njaNpKMbKSkJmGubv13NTC3wgBDJpqIY5hh7tICJZeQyrelbAUjGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=toradex.com; dmarc=pass action=none header.from=toradex.com; dkim=pass header.d=toradex.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q0HzKmSU25apdq1DtcQ2R5UycoFDC5VowhBS3rlYUiE=; b=V2UZ10xJREIxEQa/GRjY/FM4GPxbjHOpZFg4n0UWF2GTxli5lHAU6n+a6/9kzV1PLaIwhgzH+xSl1LKsS6OPkL+DlPhfNOYkTRu1hCrzUUFmPITAL2rYFaiGyjZG0Wb8/mDawDwZE+2rL/gWUu44nD3H97pxLDf7v1ZcOwPEihQ= Received: from VI1PR05MB3279.eurprd05.prod.outlook.com (10.170.238.24) by VI1PR05MB3167.eurprd05.prod.outlook.com (10.170.236.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.24; Thu, 20 Feb 2020 14:11:49 +0000 Received: from VI1PR05MB3279.eurprd05.prod.outlook.com ([fe80::c14f:4592:515f:6e52]) by VI1PR05MB3279.eurprd05.prod.outlook.com ([fe80::c14f:4592:515f:6e52%7]) with mapi id 15.20.2729.032; Thu, 20 Feb 2020 14:11:48 +0000 Received: from localhost (194.105.145.90) by PR0P264CA0102.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.17 via Frontend Transport; Thu, 20 Feb 2020 14:11:48 +0000 From: Oleksandr Suvorov To: "linux-spi@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Oleksandr Suvorov , Oleksandr Suvorov , Marcel Ziswiler , Igor Opanyuk , Philippe Schenker , Mark Brown Subject: [PATCH 1/2] spi: fsl-lpspi: remove unneeded array Thread-Topic: [PATCH 1/2] spi: fsl-lpspi: remove unneeded array Thread-Index: AQHV5/ewtAUeujGfm0+kV+RK4rZ10g== Date: Thu, 20 Feb 2020 14:11:48 +0000 Message-ID: <20200220141143.3902922-2-oleksandr.suvorov@toradex.com> References: <20200220141143.3902922-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20200220141143.3902922-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0102.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::18) To VI1PR05MB3279.eurprd05.prod.outlook.com (2603:10a6:802:1c::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.24.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 54cd37fe-360a-4f86-c938-08d7b60ed335 x-ms-traffictypediagnostic: VI1PR05MB3167: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3631; x-forefront-prvs: 031996B7EF x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(376002)(346002)(39840400004)(136003)(366004)(396003)(199004)(189003)(54906003)(110136005)(316002)(6486002)(36756003)(16526019)(66446008)(26005)(66946007)(66556008)(81156014)(81166006)(64756008)(5660300002)(8676002)(66476007)(186003)(2616005)(956004)(71200400001)(1076003)(4326008)(86362001)(52116002)(478600001)(6496006)(2906002)(8936002)(44832011);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR05MB3167;H:VI1PR05MB3279.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0e/5JYTsM7W67KWQvCwjGqeFGWNuPBkLtph2JDdVIkKNpiKnSzNRkdf3Ag2JJ5SBCOXlxRdpzJWnWfLwrmL4En0ebflNZ+soBan+VZvrKVWGkx8FwfMa0FkL9+VgBHjoFVFstScVCzeUlfpj9OcyeCBLVMWuXDV6kkXce8T9P0hAV3zgSlB5K1MtPT2qGakCAG5/lAVaYfZh4Oq/dezhwn4TYCawhWULwHwqwUpkkbMSWk208IBLSEEpIaGzjZDRVt8s02RI48vAgDpeoyVwmD60DPS1Zm3Zu6SCuwFAb4/HrV+JwKfNsTZP/VR/8vR+L5sWDdPcVNBK4gko47u7loryWZe1hJBjUXaQiCkCNSACYr0/5UFBkX3uOsG9Nx6uZ4SZDLsK+MJdqCxrBo4ioFWAvf/iXcG+JGTF/SCwLNRd8lhEaCVb2JlBRffP5eQk x-ms-exchange-antispam-messagedata: 43I0Y+REefJW5wivuigy5qGJzN0J0nzp1SRSqaBtWtdr+h7Lk6OHstyChmfL1PM34RLmdQeucRjXB6JH7/QV+Z4jiSl5SMIPQqaXzX7tkWzxZ03e+F14uhfcEw/1rVBweHkysBa0FbX9eDp+SZlWpg== MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54cd37fe-360a-4f86-c938-08d7b60ed335 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2020 14:11:48.8667 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: VfFoo565mBXRwD5HJNkJrUrKGr2QMGcDxwwMmS669TAjOE8DvjuoilizMjD1uJOEn03mJm1DO8sLX5+//1+Za3+ghiJWIxBjqzA48F/iTaM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB3167 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org - replace the array with the shift operation - remove the extra comparing operation. Signed-off-by: Oleksandr Suvorov --- drivers/spi/spi-fsl-lpspi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index d0b8cc741a24..298329b781d2 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -86,8 +86,6 @@ #define TCR_RXMSK BIT(19) #define TCR_TXMSK BIT(18) -static int clkdivs[] = {1, 2, 4, 8, 16, 32, 64, 128}; - struct lpspi_config { u8 bpw; u8 chip_select; @@ -331,15 +329,14 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi) } for (prescale = 0; prescale < 8; prescale++) { - scldiv = perclk_rate / - (clkdivs[prescale] * config.speed_hz) - 2; + scldiv = perclk_rate / config.speed_hz / (1 << prescale) - 2; if (scldiv < 256) { fsl_lpspi->config.prescale = prescale; break; } } - if (prescale == 8 && scldiv >= 256) + if (scldiv >= 256) return -EINVAL; writel(scldiv | (scldiv << 8) | ((scldiv >> 1) << 16), From patchwork Thu Feb 20 14:11:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11394211 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D491930 for ; Thu, 20 Feb 2020 14:12:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7D6A208C4 for ; Thu, 20 Feb 2020 14:11:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="bSUwk8nU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728299AbgBTOLz (ORCPT ); Thu, 20 Feb 2020 09:11:55 -0500 Received: from mail-am6eur05on2135.outbound.protection.outlook.com ([40.107.22.135]:22081 "EHLO EUR05-AM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728225AbgBTOLz (ORCPT ); Thu, 20 Feb 2020 09:11:55 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c/tmD4R+K08xtVFz0taQMAe5yRsT8+f/CJPgKsnqYAkrv0Y9uXqmjSrP0ySOs+4XT6YGlqGttwPS+uHqoyho/m7bFjbpQDHK09xGQPOmACgheRYYsUzhqzbNHBX8OTywIzPlNl1i/BAaBJrhOPFScmYT9npKcDVgpTknQsTmnFAI/6tvlDC1wkcuT6M7bQtOtJIWHjShMs+uYyE+SEdc1CmfiUsDI7A34Xdg6KD7B3EX437PAaEQkhRGXtEynx0fmyuyvTWV0+gf0TsLlRSdALdKOoOEZb6lhdmKo2j8Jt/i1qcJb+Ql3bkp53+HLN0Y2gQZ7ts/2KzieFXjOZ7s/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c6666zuqZ5ttzCGBnEQHeaMNUcYj2/9XvNHdpDnu3II=; b=TkW04KRkrrwCGMMFYORY7Hi1z4pcGu9P4WVAWpgIrfIejUG+L1G8NIJF34fXHNQz0CZ9DemH9FGZIWyx2eVnqZkLTQSQQYWMpbUx2uPj7y8UFEzQIEXYLLd0AFGrmYKOvJqGkWLI3UmszwVbUePIpy6q4gJl/cvVuVA6bhc0nvQG5su8q2jxdG4/n0kRevfvroigxda3335kJRc0Xv9r/3NTiBTfNJ/HZZn4JaD0CTMELbaLy4QBLBaD1fRU7LhnKWnsdVIuifF7eF9omrUnpIQg7DyKdhyVFi6l8p9EKHfdH/Rwd8EX9zd3BytSpcB3VgVK5+mVcYIlkvdaG9M0qQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=toradex.com; dmarc=pass action=none header.from=toradex.com; dkim=pass header.d=toradex.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c6666zuqZ5ttzCGBnEQHeaMNUcYj2/9XvNHdpDnu3II=; b=bSUwk8nUilz+9jkVusSFDnHI93/TCh8RrU59vDxpCfLdogWGHmTSKBr2FYKqQkyv9dqiVhRHWgpdoe1AUaB4dWXz9Xmkp7teKgRpFXFhCS9/xHPoK6p3nz2rgu38HTwKsSEoAF1+Zyr5gkjRDDJS/DvajOz7XBRnwBk7Md0hoNI= Received: from VI1PR05MB3279.eurprd05.prod.outlook.com (10.170.238.24) by VI1PR05MB3167.eurprd05.prod.outlook.com (10.170.236.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.24; Thu, 20 Feb 2020 14:11:51 +0000 Received: from VI1PR05MB3279.eurprd05.prod.outlook.com ([fe80::c14f:4592:515f:6e52]) by VI1PR05MB3279.eurprd05.prod.outlook.com ([fe80::c14f:4592:515f:6e52%7]) with mapi id 15.20.2729.032; Thu, 20 Feb 2020 14:11:51 +0000 Received: from localhost (194.105.145.90) by PR0P264CA0203.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.18 via Frontend Transport; Thu, 20 Feb 2020 14:11:50 +0000 From: Oleksandr Suvorov To: "linux-spi@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Oleksandr Suvorov , Oleksandr Suvorov , Marcel Ziswiler , Igor Opanyuk , Philippe Schenker , Mark Brown Subject: [PATCH 2/2] spi: spidev: fix a max speed setting Thread-Topic: [PATCH 2/2] spi: spidev: fix a max speed setting Thread-Index: AQHV5/eyaAawrcInZ0K6xjw9t46TKA== Date: Thu, 20 Feb 2020 14:11:51 +0000 Message-ID: <20200220141143.3902922-3-oleksandr.suvorov@toradex.com> References: <20200220141143.3902922-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20200220141143.3902922-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0203.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::23) To VI1PR05MB3279.eurprd05.prod.outlook.com (2603:10a6:802:1c::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.24.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: df8471fc-c73b-4575-588d-08d7b60ed48f x-ms-traffictypediagnostic: VI1PR05MB3167: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1360; x-forefront-prvs: 031996B7EF x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(376002)(346002)(39840400004)(136003)(366004)(396003)(199004)(189003)(54906003)(110136005)(316002)(6486002)(4744005)(36756003)(16526019)(66446008)(26005)(66946007)(66556008)(81156014)(81166006)(64756008)(5660300002)(8676002)(66476007)(186003)(2616005)(956004)(71200400001)(1076003)(4326008)(86362001)(52116002)(478600001)(6496006)(2906002)(8936002)(44832011);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR05MB3167;H:VI1PR05MB3279.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rk8mHLyo/pp4JMbvivfecBrgMALm0ZttMjtvyhO3Wajp+mZgt2fzlINEMoTC/eaLSOZplIpk5HU+SVsReT61Z3pNSO55cybgY9UCQehz0Aywftyccfa9gIfjvfSW+pEFTPokxHbB/QxnUxuZw+OXyEczE3xraZqNaxYJfQyIFTkqRElU7QzByJUG9sqfmDTqjOlQPoXz9NmPx0zn3PA4++oaaEb2sJEKJp2pPUONe/75ok4G/zKpoIIbAwjIgz/f1qcjhzd6NkQWU+bsm9ITNDScdoi0s9DjwLtDVW4EePMIKLj2XCAoBzd/sMJSW5eszewGv8dK5Ju7NsMv2kKkFFYkkenl64eRLMLDh3cM7wPyf3kCPhzkJrZY1lgp2snJcUxQ43eY5Aor/8kqOJZQNf0hPCZJKEVwdBn3MkxWQdAOAF2D6wAYIdSoosmaOv9k x-ms-exchange-antispam-messagedata: WkOPdIWuQV3j6u62+pcMtYWdCWKxa5E0gzLEjKrqypatgwkR+7qDAlVchVl2ME6WXbLjVRg+UFqZfim9Nj2qjxIebvcNwc0yMmAN7RiNk+YQ9GoDgv0xqeXEF8xxbrfFJuzM5y57Qg7sbrrF4TEJbg== MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: df8471fc-c73b-4575-588d-08d7b60ed48f X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2020 14:11:51.2653 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lfYP3UUigNPx+zf8Vdd2NdJZDTaTkbMPYt55ccWfwwCiRE6VJd9WEZn1chg4ZfSpi8B4nmxvY6RNIzpgUwhEny1KBDQbrHq/bS6jbuEnBmA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB3167 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org SPI_IOC_WR_MAX_SPEED_HZ command always sets spi->max_speed_hz to the initial value come from DT. It leads to set a wrong max speed with IOCTL call. Fix the logic of a max speed assignment. Signed-off-by: Oleksandr Suvorov --- drivers/spi/spidev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 1e217e3e9486..b9b3ac70eb18 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -449,11 +449,13 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) spi->max_speed_hz = tmp; retval = spi_setup(spi); - if (retval >= 0) + if (retval) { + spi->max_speed_hz = save; + } else { spidev->speed_hz = tmp; - else - dev_dbg(&spi->dev, "%d Hz (max)\n", tmp); - spi->max_speed_hz = save; + dev_dbg(&spi->dev, "%d Hz (max)\n", + spidev->speed_hz); + } } break;