From patchwork Tue Dec 11 03:34:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10723005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E9C115A6 for ; Tue, 11 Dec 2018 03:34:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 045A92A95E for ; Tue, 11 Dec 2018 03:34:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E905A2A98F; Tue, 11 Dec 2018 03:34:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 B474B2A95E for ; Tue, 11 Dec 2018 03:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729945AbeLKDeW (ORCPT ); Mon, 10 Dec 2018 22:34:22 -0500 Received: from mail-eopbgr130049.outbound.protection.outlook.com ([40.107.13.49]:5696 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729975AbeLKDeW (ORCPT ); Mon, 10 Dec 2018 22:34:22 -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=0jI4C+5xGXDmjoZa58PO21QIejoZkAIxdFp8VYozcsI=; b=L6OGvuYi3GxH2ErXrW8oYqiLrMzypcVtij8yF5QyiJgVJVfIqVRCE9q7TmpMmC9G+IwKIlCYNWFZLnWzn2BG+W9XiFfOIp6F25/T32w/bDY9GrvdPJykyQySKWoEXHVlAdXuccUARmRtrqawDzQ7k+YOkOVIqEZJkEqgEXHnWLQ= 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:17 +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:17 +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 1/2] dt-bindings: iio: accel: mma8452: add optional power supply property Thread-Topic: [PATCH V3 1/2] dt-bindings: iio: accel: mma8452: add optional power supply property Thread-Index: AQHUkQJlUYA+xQy/D0enlT0sHZgzvw== Date: Tue, 11 Dec 2018 03:34:17 +0000 Message-ID: <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:3J6s/G2vQwd1qqZDo5SKKembdw1Sg60rA3Dj6lBltc7cHIxNX8XyhGV/eX+1fuom8eyY3OymdJdjXX6ycgWJ7qw+bCkBdIkKbeXKlj0FmAMs65K/NrUxuZZOkWioyAhH5YXOCVZtj9LkQiZpUQSG5uEn67ss/exLQC47t8rOlQDX8T2gwdNoM3uKPP7SSwXkT4QUUc0nncfsNeLM9mqVoeNppWDkXoC54hxnWHBVqHz1NX527M09sa+76lzaGS8bc9GOmQmsSwrVJZuDp1GxSt81kFaM6pF1ihxdusGaAh+nRewDRv/VFPDZGqe/jOhqOyxi/7NkJI1pAwOtm5kTmRh4kGHY3A3aykQrFn/NeQBIBnTwFCATnxgYIfgJy/VlSe9Dgr5UyEmL298R2uqvM/mV7FaAAfExzM7jvUPeDGrkejONxiW9N9BiIzGyzRUU6eXapAjIQ5fkWLTf5rAFpg==;5:EtTUp0OV/jLb8ElZzNu11sJpiLziw/5KklYQpLVhF1+MczPvABC3uLnFxUZRX1EHKzTHN+5KHIh2sP3623Z+V5El7+CLet9XZs4Pumj2GlsFNo1AX83yv8ZSN5/ezGWymkW7W2/XhrNudSmtqFoFsVhbOpLDx9gEz+O9T34+YMQ=;7:RYXioR5Zweoy6KMVI0IsigeGrsvjErBbsSfcJgddrxGB7Ez9EKqTuOj1zM60klhVtcQoAtgc11Rk/Q3QB7w2iJXk76mmLg2nwm7srEq9stgUu8wFw7MhrIim2OVyh2zSL0cpx04zXjy7MpBXW+PjxA== x-ms-office365-filtering-correlation-id: 2193c9d7-88ec-4bc4-75a0-08d65f19874b 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)(6512007)(478600001)(4326008)(86362001)(5660300001)(53936002)(256004)(6486002)(316002)(8676002)(8936002)(50226002)(7416002)(2201001)(39060400002)(81166006)(486006)(97736004)(81156014)(476003)(2616005)(2906002)(25786009)(106356001)(2501003)(105586002)(386003)(71190400001)(14454004)(71200400001)(186003)(110136005)(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: 2omsoTwa2U/qwFyqLcHE0SM8Msdafmcna7S2D62suuhSuuFl1Z+nfoSieenW6IZngYU7N/BsQqguOY14dV6TctINKY+mCDpVGpv/dbgesW94u8zir1mMRvykhVBxDoLXpq3Ho0t7XhrmqxBe2im5ggnKihXHECWUhoHmwHQd8wtqpPtKsyccoYTZ6QgrBXoB/BR+lxJnB/CdetRTgNGjS6b/qVolbTfXLThrB1AKOruHTo0uxeJ5ODkUSvTD4s6EgFLcc55Ytayi2Zz5/HERrWu/V2W8l1vztXCVrY4DUPT/jVq03q/1GgpxP/Ltd5N/ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2193c9d7-88ec-4bc4-75a0-08d65f19874b X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 03:34:17.2927 (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-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The accelerometer's power supply could be controlled by regulator on some platforms, add optional property "vdd/vddio" power supply to let device tree to pass phandles to the regulators to driver. Signed-off-by: Anson Huang --- Documentation/devicetree/bindings/iio/accel/mma8452.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/accel/mma8452.txt b/Documentation/devicetree/bindings/iio/accel/mma8452.txt index 2100e9a..e132394 100644 --- a/Documentation/devicetree/bindings/iio/accel/mma8452.txt +++ b/Documentation/devicetree/bindings/iio/accel/mma8452.txt @@ -20,6 +20,10 @@ Optional properties: - interrupt-names: should contain "INT1" and/or "INT2", the accelerometer's interrupt line in use. + - vdd-supply: phandle to the regulator that provides vdd power to the accelerometer. + + - vddio-supply: phandle to the regulator that provides vddio power to the accelerometer. + Example: mma8453fc@1d { From patchwork Tue Dec 11 03:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10723007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CE4815A6 for ; Tue, 11 Dec 2018 03:34:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B59E2A95E for ; Tue, 11 Dec 2018 03:34:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F9202A983; Tue, 11 Dec 2018 03:34:31 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 181522A980 for ; Tue, 11 Dec 2018 03:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729986AbeLKDe2 (ORCPT ); Mon, 10 Dec 2018 22:34:28 -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 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-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 #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; }; /** @@ -1533,10 +1536,37 @@ static int mma8452_probe(struct i2c_client *client, data->client = client; mutex_init(&data->lock); data->chip_info = match->data; + data->vdd_reg = devm_regulator_get_optional(&client->dev, "vdd"); + if (!IS_ERR(data->vdd_reg)) { + ret = regulator_enable(data->vdd_reg); + if (ret) { + dev_err(&client->dev, "failed to enable VDD regulator\n"); + return ret; + } + } else { + ret = PTR_ERR(data->vdd_reg); + if (ret != -ENODEV) + return ret; + } + + data->vddio_reg = devm_regulator_get_optional(&client->dev, "vddio"); + if (!IS_ERR(data->vddio_reg)) { + ret = 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 = PTR_ERR(data->vddio_reg); + if (ret != -ENODEV) + return ret; + } ret = i2c_smbus_read_byte_data(client, MMA8452_WHO_AM_I); if (ret < 0) - return ret; + goto disable_regulators; 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 = -ENODEV; + goto disable_regulators; } dev_info(&client->dev, "registering %s accelerometer; ID 0x%x\n", @@ -1566,13 +1597,13 @@ static int mma8452_probe(struct i2c_client *client, ret = mma8452_reset(client); if (ret < 0) - return ret; + goto disable_regulators; data->data_cfg = MMA8452_DATA_CFG_FS_2G; ret = i2c_smbus_write_byte_data(client, MMA8452_DATA_CFG, data->data_cfg); if (ret < 0) - return ret; + goto disable_regulators; /* * By default set transient threshold to max to avoid events if @@ -1581,7 +1612,7 @@ static int mma8452_probe(struct i2c_client *client, ret = i2c_smbus_write_byte_data(client, MMA8452_TRANSIENT_THS, MMA8452_TRANSIENT_THS_MASK); if (ret < 0) - return ret; + goto disable_regulators; 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; 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; ret = mma8452_trigger_setup(indio_dev); if (ret < 0) - return ret; + goto disable_regulators; } data->ctrl_reg1 = MMA8452_CTRL_ACTIVE | @@ -1661,12 +1692,20 @@ static int mma8452_probe(struct i2c_client *client, trigger_cleanup: mma8452_trigger_cleanup(indio_dev); +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; } static int mma8452_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); + struct mma8452_data *data = iio_priv(indio_dev); + int ret; iio_device_unregister(indio_dev); @@ -1678,6 +1717,21 @@ static int mma8452_remove(struct i2c_client *client) mma8452_trigger_cleanup(indio_dev); mma8452_standby(iio_priv(indio_dev)); + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = regulator_disable(data->vddio_reg); + if (ret) { + dev_err(&client->dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + return 0; } @@ -1696,6 +1750,21 @@ static int mma8452_runtime_suspend(struct device *dev) return -EAGAIN; } + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + return 0; } @@ -1705,6 +1774,23 @@ static int mma8452_runtime_resume(struct device *dev) struct mma8452_data *data = iio_priv(indio_dev); int ret, sleep_val; + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = 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 = mma8452_active(data); if (ret < 0) return ret; @@ -1723,14 +1809,94 @@ static int mma8452_runtime_resume(struct device *dev) #ifdef CONFIG_PM_SLEEP static int mma8452_suspend(struct device *dev) { - return mma8452_standby(iio_priv(i2c_get_clientdata( + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + struct mma8452_data *data = iio_priv(indio_dev); + int ret; + + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = 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 = mma8452_standby(iio_priv(i2c_get_clientdata( to_i2c_client(dev)))); + if (ret) + return ret; + + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + + return 0; } static int mma8452_resume(struct device *dev) { - return mma8452_active(iio_priv(i2c_get_clientdata( + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + struct mma8452_data *data = iio_priv(indio_dev); + int ret; + + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = 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 = mma8452_active(iio_priv(i2c_get_clientdata( to_i2c_client(dev)))); + if (ret) + return ret; + + if (!IS_ERR(data->vdd_reg)) { + ret = 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 = regulator_disable(data->vddio_reg); + if (ret) { + dev_err(dev, "failed to disable VDDIO regulator\n"); + return ret; + } + } + + return 0; } #endif