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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 46E88C5CFFE for ; Tue, 11 Dec 2018 03:34:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E91C620672 for ; Tue, 11 Dec 2018 03:34:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="e61Ye5D3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E91C620672 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730006AbeLKDe3 (ORCPT ); Mon, 10 Dec 2018 22:34:29 -0500 Received: from mail-eopbgr130049.outbound.protection.outlook.com ([40.107.13.49]:17120 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729975AbeLKDe1 (ORCPT ); Mon, 10 Dec 2018 22:34:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WDkR1vAUxAL5q+rcClfkWs7YMY2Mn/21Wm+57kPhelk=; b=e61Ye5D313AU8thp11nymnRTO4FaEmGexTeC5rLyjI3WIJSuOwtmvooHhQP6gC8wJ9e3h0GRpt2PQWAlITHBRwfSw/5IKYeGznBp3jb6f4SzvjtrAPI02uPuqFJ2v6QkoF1qfbpg3/7nJJQ2gnSHbJ3IuwHta8adRqyryk9qkEM= Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com (52.134.72.18) by DB3PR0402MB3674.eurprd04.prod.outlook.com (52.134.66.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Tue, 11 Dec 2018 03:34:23 +0000 Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd]) by DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::adf8:f49d:deb4:58fd%3]) with mapi id 15.20.1404.026; Tue, 11 Dec 2018 03:34:23 +0000 From: Anson Huang To: "jic23@kernel.org" , "knaack.h@gmx.de" , "lars@metafoo.de" , "pmeerw@pmeerw.net" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "gregkh@linuxfoundation.org" , "martink@posteo.de" , Leonard Crestez , "rtresidd@electromag.com.au" , "gustavo@embeddedor.com" , "linux-iio@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "festevam@gmail.com" , "preid@electromag.com.au" CC: dl-linux-imx Subject: [PATCH V3 2/2] iio: accell: mma8452: add optional vdd/vddio regulator operation support Thread-Topic: [PATCH V3 2/2] iio: accell: mma8452: add optional vdd/vddio regulator operation support Thread-Index: AQHUkQJoCiY/2yJAz02lUesFBkDfeg== Date: Tue, 11 Dec 2018 03:34:22 +0000 Message-ID: <1544498901-8744-2-git-send-email-Anson.Huang@nxp.com> References: <1544498901-8744-1-git-send-email-Anson.Huang@nxp.com> In-Reply-To: <1544498901-8744-1-git-send-email-Anson.Huang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR01CA0046.apcprd01.prod.exchangelabs.com (2603:1096:203:3e::34) To DB3PR0402MB3916.eurprd04.prod.outlook.com (2603:10a6:8:10::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DB3PR0402MB3674;6:KgirR7hQ3WzaBK/HtCgme43c+GO8zXmC8YHl1/+horFO5CyWmLV3owV4viS3OiNhEPMgl73pGJtuJzzl6NjaqMUg6AskuwomEmt4v3740CCsVrTNYAQ814wUj7KolENPjOIFhR/GFR+AbVjE58l9bhyVfqooGQ3AJFye969mkMwhLcfK6jwUmgbBnS4oW6YYU1zhZEAaUJi45OSZQ4bP6l+6z1iHzAdR2YDNCXLmqmLxqiwBZoF292jVRpUVSVbebmrOPWmjp4n8ahWdROhbNswBMg/kINfdG64GkjXomkPFfFhJA1APxkmVUE1KpjRoi/Vfp2gjtdvvdA+cq9PWbVpq0cGDFl1qiYAeIOXhrbhghpVPdWNPLpTgqr34NY0rTDNDY/soPFfMIS4Ys0rDskDSU76fsaFDQ6U/xTWwxT7CFdeNu1KxI2aZigTjYn4PrKo+u4s10gxANurvXBlnwg==;5:Z/s/W3bxDUJy8kxJljmmFSEaI20yGhT9qUgoAdOFO4M1ElHbXHGvQn0FjZ57Z0z83Fev3Vo2LhBJkvg6xXkzLy+1jxgQh+zliJDs5j2BEEKwaiWNb0/yMQdWtJ7Gv8/6+KmHwyA4+9plxWaVQ38A93KjPggBCveK7RmlGZjxP70=;7:lHbFXAe2TM4bkS6TGkcraEy0ohKllDxLoI6GbaRCLNBAWSTO3xtXUyMz38u0L2/dE+8mO+8rSLbTXIb4MNEc/mxD3Noe0lk2CVR6bxI1Z5yWA4RgMYREBjEtDCPJkcXcOJhfZchoYKJBPWEI8FHbRg== x-ms-office365-filtering-correlation-id: eb2ef6e5-d53a-4542-0102-08d65f198acd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:DB3PR0402MB3674; x-ms-traffictypediagnostic: DB3PR0402MB3674: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230017)(999002)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231472)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:DB3PR0402MB3674;BCL:0;PCL:0;RULEID:;SRVR:DB3PR0402MB3674; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(39860400002)(396003)(376002)(346002)(189003)(199004)(54534003)(6512007)(575784001)(478600001)(4326008)(86362001)(5660300001)(53936002)(256004)(6486002)(316002)(8676002)(14444005)(8936002)(50226002)(7416002)(2201001)(39060400002)(81166006)(486006)(97736004)(81156014)(476003)(2616005)(2906002)(25786009)(106356001)(2501003)(105586002)(386003)(71190400001)(14454004)(446003)(71200400001)(11346002)(186003)(110136005)(76176011)(66066001)(52116002)(102836004)(26005)(7736002)(99286004)(36756003)(3846002)(68736007)(6116002)(305945005)(6436002)(6506007)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR0402MB3674;H:DB3PR0402MB3916.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: J3++yBmSN8psCZDGGNCviho1Wq6zmMdNpRyf+MEixBVDnzwwk3vOLnPNDo7gcPOOuBhrsg5qI49dHB8QMu1vqmf4mn7X80FULjJcu5dD52VjgGi7xRaiiMZWAKdqwwVU5EfjNGYzde8MB9G/iOodCPO6z3Z/OUm8JBv+J6dQ9CZArtMxIViJpnDyr78/XEMyNLKoerJvunK9erl9CSgjB2VyeU63kP73WSjBfJ+nhTaq2XpUNzhe3SLyYJbtNl1IPqSXU9muLOOtUrBGl2GkKsp0Svv2JESBF6H69pBARxgeLhfzqTmNOtBLimFvbbKZ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb2ef6e5-d53a-4542-0102-08d65f198acd X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 03:34:23.0188 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3674 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The accelerometer's power supply could be controlled by regulator on some platforms, such as i.MX6Q-SABRESD board, the mma8451's power supply is controlled by a GPIO fixed regulator, need to make sure the regulator is enabled before any communication with mma8451, this patch adds optional vdd/vddio regulator operation support. Signed-off-by: Anson Huang Acked-by: Martin Kepplinger --- ChangeLog since V2: - improve the error handling of devm_regulator_get_optional; - make sure regulators are disabled in error path. --- drivers/iio/accel/mma8452.c | 186 ++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 176 insertions(+), 10 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 421a0a8..556dbc9 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -31,6 +31,7 @@ #include #include #include +#include =20 #define MMA8452_STATUS 0x00 #define MMA8452_STATUS_DRDY (BIT(2) | BIT(1) | BIT(0)) @@ -107,6 +108,8 @@ struct mma8452_data { u8 data_cfg; const struct mma_chip_info *chip_info; int sleep_val; + struct regulator *vdd_reg; + struct regulator *vddio_reg; }; =20 /** @@ -1533,10 +1536,37 @@ static int mma8452_probe(struct i2c_client *client, data->client =3D client; mutex_init(&data->lock); data->chip_info =3D match->data; + data->vdd_reg =3D devm_regulator_get_optional(&client->dev, "vdd"); + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_enable(data->vdd_reg); + if (ret) { + dev_err(&client->dev, "failed to enable VDD regulator\n"); + return ret; + } + } else { + ret =3D PTR_ERR(data->vdd_reg); + if (ret !=3D -ENODEV) + return ret; + } + + data->vddio_reg =3D devm_regulator_get_optional(&client->dev, "vddio"); + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_enable(data->vddio_reg); + if (ret) { + dev_err(&client->dev, "failed to enable VDDIO regulator\n"); + if (!IS_ERR(data->vdd_reg)) + regulator_disable(data->vdd_reg); + return ret; + } + } else { + ret =3D PTR_ERR(data->vddio_reg); + if (ret !=3D -ENODEV) + return ret; + } =20 ret =3D i2c_smbus_read_byte_data(client, MMA8452_WHO_AM_I); if (ret < 0) - return ret; + goto disable_regulators; =20 switch (ret) { case MMA8451_DEVICE_ID: @@ -1549,7 +1579,8 @@ static int mma8452_probe(struct i2c_client *client, break; /* else: fall through */ default: - return -ENODEV; + ret =3D -ENODEV; + goto disable_regulators; } =20 dev_info(&client->dev, "registering %s accelerometer; ID 0x%x\n", @@ -1566,13 +1597,13 @@ static int mma8452_probe(struct i2c_client *client, =20 ret =3D mma8452_reset(client); if (ret < 0) - return ret; + goto disable_regulators; =20 data->data_cfg =3D MMA8452_DATA_CFG_FS_2G; ret =3D i2c_smbus_write_byte_data(client, MMA8452_DATA_CFG, data->data_cfg); if (ret < 0) - return ret; + goto disable_regulators; =20 /* * By default set transient threshold to max to avoid events if @@ -1581,7 +1612,7 @@ static int mma8452_probe(struct i2c_client *client, ret =3D i2c_smbus_write_byte_data(client, MMA8452_TRANSIENT_THS, MMA8452_TRANSIENT_THS_MASK); if (ret < 0) - return ret; + goto disable_regulators; =20 if (client->irq) { int irq2; @@ -1595,7 +1626,7 @@ static int mma8452_probe(struct i2c_client *client, MMA8452_CTRL_REG5, data->chip_info->all_events); if (ret < 0) - return ret; + goto disable_regulators; =20 dev_dbg(&client->dev, "using interrupt line INT1\n"); } @@ -1604,11 +1635,11 @@ static int mma8452_probe(struct i2c_client *client, MMA8452_CTRL_REG4, data->chip_info->enabled_events); if (ret < 0) - return ret; + goto disable_regulators; =20 ret =3D mma8452_trigger_setup(indio_dev); if (ret < 0) - return ret; + goto disable_regulators; } =20 data->ctrl_reg1 =3D MMA8452_CTRL_ACTIVE | @@ -1661,12 +1692,20 @@ static int mma8452_probe(struct i2c_client *client, trigger_cleanup: mma8452_trigger_cleanup(indio_dev); =20 +disable_regulators: + if (!IS_ERR(data->vdd_reg)) + regulator_disable(data->vdd_reg); + if (!IS_ERR(data->vddio_reg)) + regulator_disable(data->vddio_reg); + return ret; } =20 static int mma8452_remove(struct i2c_client *client) { struct iio_dev *indio_dev =3D i2c_get_clientdata(client); + struct mma8452_data *data =3D iio_priv(indio_dev); + int ret; =20 iio_device_unregister(indio_dev); =20 @@ -1678,6 +1717,21 @@ static int mma8452_remove(struct i2c_client *client) mma8452_trigger_cleanup(indio_dev); mma8452_standby(iio_priv(indio_dev)); =20 + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_disable(data->vdd_reg); + if (ret) { + dev_err(&client->dev, "failed to disable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_disable(data->vddio_reg); + if (ret) { + dev_err(&client->dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + return 0; } =20 @@ -1696,6 +1750,21 @@ static int mma8452_runtime_suspend(struct device *de= v) return -EAGAIN; } =20 + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_disable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to disable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + return 0; } =20 @@ -1705,6 +1774,23 @@ static int mma8452_runtime_resume(struct device *dev= ) struct mma8452_data *data =3D iio_priv(indio_dev); int ret, sleep_val; =20 + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_enable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to enable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_enable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to enable VDDIO regulator\n"); + if (!IS_ERR(data->vdd_reg)) + regulator_disable(data->vdd_reg); + return ret; + } + } + ret =3D mma8452_active(data); if (ret < 0) return ret; @@ -1723,14 +1809,94 @@ static int mma8452_runtime_resume(struct device *de= v) #ifdef CONFIG_PM_SLEEP static int mma8452_suspend(struct device *dev) { - return mma8452_standby(iio_priv(i2c_get_clientdata( + struct iio_dev *indio_dev =3D i2c_get_clientdata(to_i2c_client(dev)); + struct mma8452_data *data =3D iio_priv(indio_dev); + int ret; + + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_enable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to enable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_enable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to enable VDDIO regulator\n"); + if (!IS_ERR(data->vdd_reg)) + regulator_disable(data->vdd_reg); + return ret; + } + } + + ret =3D mma8452_standby(iio_priv(i2c_get_clientdata( to_i2c_client(dev)))); + if (ret) + return ret; + + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_disable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to disable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + + return 0; } =20 static int mma8452_resume(struct device *dev) { - return mma8452_active(iio_priv(i2c_get_clientdata( + struct iio_dev *indio_dev =3D i2c_get_clientdata(to_i2c_client(dev)); + struct mma8452_data *data =3D iio_priv(indio_dev); + int ret; + + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_enable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to enable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_enable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to enable VDDIO regulator\n"); + if (!IS_ERR(data->vdd_reg)) + regulator_disable(data->vdd_reg); + return ret; + } + } + + ret =3D mma8452_active(iio_priv(i2c_get_clientdata( to_i2c_client(dev)))); + if (ret) + return ret; + + if (!IS_ERR(data->vdd_reg)) { + ret =3D regulator_disable(data->vdd_reg); + if (ret) { + dev_err(dev, "failed to disable VDD regulator\n"); + return ret; + } + } + if (!IS_ERR(data->vddio_reg)) { + ret =3D regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + + return 0; } #endif =20 --=20 2.7.4