From patchwork Fri May 11 08:54:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Tresidder X-Patchwork-Id: 10393697 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 1EA0060236 for ; Fri, 11 May 2018 09:05:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50E8228DEB for ; Fri, 11 May 2018 09:05:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4534228E3D; Fri, 11 May 2018 09:05:08 +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.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 EE7AC28DEB for ; Fri, 11 May 2018 09:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbeEKJFG (ORCPT ); Fri, 11 May 2018 05:05:06 -0400 Received: from smtp688out9.mel.oss-core.net ([210.50.217.236]:57442 "EHLO smtp688out9.mel.oss-core.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbeEKJFF (ORCPT ); Fri, 11 May 2018 05:05:05 -0400 X-Greylist: delayed 601 seconds by postgrey-1.27 at vger.kernel.org; Fri, 11 May 2018 05:05:05 EDT X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BBCgCiWfVa/1pXoctcHgEGDINDgVw?= =?us-ascii?q?WEoxUjBABgikBXZM1FIFkNgGHZzQYAQIBAQEBAQECbChCAQEDCQKFBC9ySyU?= =?us-ascii?q?SgyOBdAytcDOIRoJIiXk/g2yEah+FbAKMeIs5CWeNbIxnkX8cOIFSTR8Zgn6?= =?us-ascii?q?QWzIweAGDIE+JY4JGAQE?= X-IPAS-Result: =?us-ascii?q?A2BBCgCiWfVa/1pXoctcHgEGDINDgVwWEoxUjBABgikBX?= =?us-ascii?q?ZM1FIFkNgGHZzQYAQIBAQEBAQECbChCAQEDCQKFBC9ySyUSgyOBdAytcDOIR?= =?us-ascii?q?oJIiXk/g2yEah+FbAKMeIs5CWeNbIxnkX8cOIFSTR8Zgn6QWzIweAGDIE+JY?= =?us-ascii?q?4JGAQE?= X-IronPort-AV: E=Sophos;i="5.49,387,1520859600"; d="scan'208";a="37157117" Received: from 203.161.87.90.static.amnet.net.au (HELO electromag.com.au) ([203.161.87.90]) by smtp688.mel.oss-core.net with ESMTP; 11 May 2018 18:55:00 +1000 From: Richard Tresidder To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, harinath922@gmail.com, martink@posteo.de, rtresidd@electromag.com.au, linux-iio@vger.kernel.org Subject: [PATCH v4 1/1] iio: accell: mma8452: Reduce sleep time when data not ready Date: Fri, 11 May 2018 16:54:59 +0800 Message-Id: <1526028899-4995-1-git-send-email-rtresidd@electromag.com.au> X-Mailer: git-send-email 1.8.3.1 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Modified the sleep method when data is not ready to allow for sampling > 50sps to work. Signed-off-by: Richard Tresidder --- Notes: v4: Changes from v3 * fix long line * fix eol issues with patch v3: Changes from v2 * Removed fallthrough fix (will submit separately) * Fixed some blank lines, trailing white spaces. v2: Changes from v1 * Remove whitespace changes * Added fallthrough fix (subsequently removed drivers/iio/accel/mma8452.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 7a2da7f..7e3d82c 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -106,6 +106,7 @@ struct mma8452_data { u8 ctrl_reg1; u8 data_cfg; const struct mma_chip_info *chip_info; + int sleep_val; }; /** @@ -193,7 +194,11 @@ static int mma8452_drdy(struct mma8452_data *data) if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY) return 0; - msleep(20); + if (data->sleep_val <= 20) + usleep_range(data->sleep_val * 250, + data->sleep_val * 500); + else + msleep(20); } dev_err(&data->client->dev, "data not ready\n"); @@ -544,6 +549,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev, return -EINVAL; } +static int mma8452_calculate_sleep(struct mma8452_data *data) +{ + int ret, i = mma8452_get_odr_index(data); + + if (mma8452_samp_freq[i][0] > 0) + ret = 1000 / mma8452_samp_freq[i][0]; + else + ret = 1000; + + return ret == 0 ? 1 : ret; +} + static int mma8452_standby(struct mma8452_data *data) { return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1, @@ -700,6 +717,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev, data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK; data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT; + data->sleep_val = mma8452_calculate_sleep(data); + ret = mma8452_change_config(data, MMA8452_CTRL_REG1, data->ctrl_reg1); break; @@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client, data->ctrl_reg1 = MMA8452_CTRL_ACTIVE | (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT); + + data->sleep_val = mma8452_calculate_sleep(data); + ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1, data->ctrl_reg1); if (ret < 0)