From patchwork Mon Mar 26 13:59:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Maneyrol X-Patchwork-Id: 10307877 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 660B4600F6 for ; Mon, 26 Mar 2018 13:59:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CE54296E5 for ; Mon, 26 Mar 2018 13:59:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 516FB296EE; Mon, 26 Mar 2018 13:59:23 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 B6244296E5 for ; Mon, 26 Mar 2018 13:59:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751374AbeCZN7V (ORCPT ); Mon, 26 Mar 2018 09:59:21 -0400 Received: from mail-dm3nam03on0065.outbound.protection.outlook.com ([104.47.41.65]:54240 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751752AbeCZN7G (ORCPT ); Mon, 26 Mar 2018 09:59:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=invensense.onmicrosoft.com; s=selector1-invensense-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kaA8XerSbJuuMi83Bek0nOZosHZm7S4SWVNLq3ehOxs=; b=qGsXKhqDKDxJvLvT2am2B3bEP0tKvl/M1BeT3GpuSWVAN81gDJFPwyoCMA01/naZtBdtYIZE0XSgfoetjSDc3x20me9YXPVRryN/byVuE2N/eo0zYb51plfO+Ryy/6p4w7bG0bwxBttXNGR5qgAyieUjLojTywvJYn6x4jXROYs= Received: from CY4PR1201MB0184.namprd12.prod.outlook.com (10.172.78.141) by CY4PR1201MB2533.namprd12.prod.outlook.com (10.172.120.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.12; Mon, 26 Mar 2018 13:59:04 +0000 Received: from CY4PR1201MB0184.namprd12.prod.outlook.com ([fe80::6cd9:f753:b84b:7f85]) by CY4PR1201MB0184.namprd12.prod.outlook.com ([fe80::6cd9:f753:b84b:7f85%13]) with mapi id 15.20.0609.012; Mon, 26 Mar 2018 13:59:04 +0000 From: Jean-Baptiste Maneyrol To: linux-iio Subject: [PATCH 1/3] iio: imu: inv_mpu6050: clean set_power_itg and fix usage Thread-Topic: [PATCH 1/3] iio: imu: inv_mpu6050: clean set_power_itg and fix usage Thread-Index: AQHTxQnGKbgDWc2FJkG//BSXAWTPtQ== Date: Mon, 26 Mar 2018 13:59:03 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=JManeyrol@invensense.com; x-originating-ip: [92.154.85.143] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR1201MB2533; 7:7NhX22qMqd5/9NJeYAu2LUtQnY0UFUVSP9pEldif2Ugm4I8d7YhSIji3yjYAUq7FNVJoluh4kvET8KMyOCzGvOUg6wZ724Ykvotko4yJsZy6UdPMwR8Nv2JGBTfhIbXvobKJxyP3r/fMzZragjR1yRwOBqO2/1wsNWb2pYCCxZJ+ygG96rVfCB/FwNC0rnqZ5aOruBrX1NHTtPvw8nmQd1Tg5QwqrdBM2daa5b/j+ORQeFzjab4UokcjZasgGvG2 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 23b5e282-1adf-4081-5605-08d59321bbfe x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR1201MB2533; x-ms-traffictypediagnostic: CY4PR1201MB2533: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(257004950022427); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231221)(944501327)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:CY4PR1201MB2533; BCL:0; PCL:0; RULEID:; SRVR:CY4PR1201MB2533; x-forefront-prvs: 06237E4555 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(39850400004)(39380400002)(366004)(346002)(189003)(199004)(26005)(66066001)(186003)(8936002)(5660300001)(102836004)(33656002)(106356001)(81166006)(81156014)(8676002)(86362001)(72206003)(6436002)(2906002)(3280700002)(14454004)(55016002)(53936002)(3846002)(6116002)(9686003)(2900100001)(99286004)(478600001)(5250100002)(80792005)(6916009)(97736004)(7696005)(6506007)(68736007)(59450400001)(305945005)(3660700001)(316002)(74316002)(105586002)(7736002)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1201MB2533; H:CY4PR1201MB0184.namprd12.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: invensense.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: vjtBWfNRlbfwohHxA9LJ4LJNRqVj6fXESNI0Y/Q/TeUU5l7EdkVihVkWvN3idxrQZK62F+IcnvUsRte0aLyHmlNGitSeWXMAeO4oWRAR2SpzNQ6Afd3HX0In3aqYE+Nyds7iGC18s6FJbxpQEa/SadiZOnB1A9JqCBFjqv15lFQ7ukU6CXBKGZlRoeEs5ZwFrPVIiOb7rA/ZdEx0qbSTDOmm+sowFfpJWBwHRi8osY+Ow+7wrO/ULnxyYuY+GKAgys8nhBz7K3Cv6c9ocMVfo20BSnsjK86Dj8ANwpIXDUE2l8dhT3ikCi66ZRpoOm7bsKao0yRuo8/QHpDCvZUJag== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: invensense.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23b5e282-1adf-4081-5605-08d59321bbfe X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2018 13:59:03.6731 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 462b3b3b-e42b-47ea-801a-f1581aac892d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2533 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 Rewrite set_power_itg in a more clean way (failing now don't update the reference counter) and fix usage in init function (setting power on one time is sufficient to ensure chip is effectively on). Signed-off-by: Jean-Baptiste Maneyrol --- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 44 ++++++++++++++++++------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 7d64be3..9f97f4f 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -185,26 +185,29 @@ int inv_mpu6050_switch_engine(struct inv_mpu6050_state *st, bool en, u32 mask) int inv_mpu6050_set_power_itg(struct inv_mpu6050_state *st, bool power_on) { - int result = 0; + int result; if (power_on) { - if (!st->powerup_count) + if (st->powerup_count == 0) { result = regmap_write(st->map, st->reg->pwr_mgmt_1, 0); - if (!result) - st->powerup_count++; + if (result) + return result; + usleep_range(INV_MPU6050_REG_UP_TIME_MIN, + INV_MPU6050_REG_UP_TIME_MAX); + } + st->powerup_count++; } else { - st->powerup_count--; - if (!st->powerup_count) + if (st->powerup_count == 1) { result = regmap_write(st->map, st->reg->pwr_mgmt_1, INV_MPU6050_BIT_SLEEP); + if (result) + return result; + } + st->powerup_count--; } - if (result) - return result; - - if (power_on) - usleep_range(INV_MPU6050_REG_UP_TIME_MIN, - INV_MPU6050_REG_UP_TIME_MAX); + dev_dbg(regmap_get_device(st->map), "set power %d, count=%u\n", + power_on, st->powerup_count); return 0; } @@ -850,14 +853,11 @@ static int inv_check_and_setup_chip(struct inv_mpu6050_state *st) msleep(INV_MPU6050_POWER_UP_TIME); /* - * toggle power state. After reset, the sleep bit could be on - * or off depending on the OTP settings. Toggling power would + * toggle power on. After reset, the sleep bit could be on + * or off depending on the OTP settings. Toggling power on * make it in a definite state as well as making the hardware * state align with the software state */ - result = inv_mpu6050_set_power_itg(st, false); - if (result) - return result; result = inv_mpu6050_set_power_itg(st, true); if (result) return result; @@ -865,13 +865,21 @@ static int inv_check_and_setup_chip(struct inv_mpu6050_state *st) result = inv_mpu6050_switch_engine(st, false, INV_MPU6050_BIT_PWR_ACCL_STBY); if (result) - return result; + goto error_power_off; result = inv_mpu6050_switch_engine(st, false, INV_MPU6050_BIT_PWR_GYRO_STBY); if (result) + goto error_power_off; + + result = inv_mpu6050_set_power_itg(st, false); + if (result) return result; return 0; + +error_power_off: + inv_mpu6050_set_power_itg(st, false); + return result; } int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,