Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1903845imu; Sat, 5 Jan 2019 09:31:09 -0800 (PST) X-Google-Smtp-Source: ALg8bN7yuBePzluf46+9+n53S+u1UoLzYpGLev4/vPfuT+8iFXwKDh74etaO20UcTzR/e1zm0VUM X-Received: by 2002:a63:5f50:: with SMTP id t77mr5447136pgb.76.1546709469784; Sat, 05 Jan 2019 09:31:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546709469; cv=none; d=google.com; s=arc-20160816; b=GS6CLK360sGH2mTY/DouqEvFuCqZNFFJo3yPsAQU+nd9lQAveUR+N+RHR/P4NTrxda nGJ+Q76m4Ork43HyAMmgJTQ5dkDEef4DiHyep495O6bbJg+X4i9Un+Qpl/Tny+ZglI5y SJTQclr/WK076WfHqag6+ErlwjmvRkbI7gyZUP7QZjllXilG8EscC6er4oydkCzzHwIj t1ae1UXsuMIXidCZRev0iEKhEBQ7qftVWjJvTdGTwtEEm4emmlKFRIjnzFx993XI9S7s DFYr6eTNW9yO9xef1l3vATP1xHfMlSEGu4uS45cqvY6zBi7s7VEXY7viOlDaCY59WxmO Al6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=iwFoHgyqCX1OWXU8l5wjb7Jhc38wYzgNHKoIIEujuss=; b=y3FXN17vY0RL8PM/NjiLhL2wm0L8yPGqn1VKUpGzXdDn6ScuS5AyFfjLS3feF+8pyD JJKG7syJswtf+RFtB+KO+IvLh9uZvm5lAkhBX7t5B3tnnQ8h/rtk5b7GUz71zs/IdrI5 VzTY0yoGyA7OCvpKNgSZVYVCLt83CQDeaClKP3A/N6N6oEVZWpRjbYTAoFMLc/YhPXU2 XB/WS3QRXrelKA93ZCKNyOct2H6T0UdQXaCIzssRMZpckpJri/dd2ArPNShM9vziIzFB RQP2cQRU1hhv703Yrola/PMkRH2L+lul0HTru4uITrcBF4GjGnyyBDXTk7s6qP56rAx2 dQOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H75Tt4ul; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l66si15267819pga.151.2019.01.05.09.30.54; Sat, 05 Jan 2019 09:31:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H75Tt4ul; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726349AbfAER3u (ORCPT + 99 others); Sat, 5 Jan 2019 12:29:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:53972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726252AbfAER3t (ORCPT ); Sat, 5 Jan 2019 12:29:49 -0500 Received: from archlinux (cpc91196-cmbg18-2-0-cust659.5-4.cable.virginm.net [81.96.234.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A74F62087F; Sat, 5 Jan 2019 17:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546709388; bh=/Gc1NF089ij9cSPRamzekmpWsDUwu32hdN1jCXRSfcg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=H75Tt4ul0btps8e8AbzBt/fzVW7tt6zKxhFvIj37vZg5n0rW74q86VKRL8DeKDq9i zFtk7eUznSg6fU0+rwUNI7reOcp/D3wctEh983ge2+Wamj/v97hgjxJtACFM48uB8t ZoFRcw0HxfyUq4m1Esm38rbpYLWSbIMWkCtkYHlo= Date: Sat, 5 Jan 2019 17:29:42 +0000 From: Jonathan Cameron To: Anson Huang Cc: "knaack.h@gmx.de" , "lars@metafoo.de" , "pmeerw@pmeerw.net" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "martink@posteo.de" , Leonard Crestez , "gregkh@linuxfoundation.org" , "gustavo@embeddedor.com" , "rtresidd@electromag.com.au" , "linux-iio@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , dl-linux-imx Subject: Re: [PATCH V6 2/2] iio: accell: mma8452: add vdd/vddio regulator operation support Message-ID: <20190105172942.2787d236@archlinux> In-Reply-To: <1545555462-16121-2-git-send-email-Anson.Huang@nxp.com> References: <1545555462-16121-1-git-send-email-Anson.Huang@nxp.com> <1545555462-16121-2-git-send-email-Anson.Huang@nxp.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 23 Dec 2018 09:02:32 +0000 Anson Huang wrote: > The accelerometer's power supply could be controllable on some > platforms, such as i.MX6Q-SABRESD board, the mma8451's power supplies > are controlled by a GPIO fixed regulator, need to make sure the > regulators are enabled before any communication with mma8451, this > patch adds vdd/vddio regulator operation support. > > Signed-off-by: Anson Huang > Acked-by: Martin Kepplinger I'm fine with the general approach now, though I would like separate error handling for the two different regulators. Also, this has obviously changed a fair bit since Martin originally gave that Ack. Martin, could you confirm you are still happy with the code? Thanks, Jonathan > --- > ChangeLog since V5: > - ONLY enable vdd/vddio regulators after both of them are aquired; > - Since the suspend/resume operations are same as runtime suspend/resume, so just use the > pm_runtime_force_suspend/resume for suspend/resuem callback to simply the code. > --- > drivers/iio/accel/mma8452.c | 99 +++++++++++++++++++++++++++++++++++---------- > 1 file changed, 77 insertions(+), 22 deletions(-) > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 421a0a8..7519ed5 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; > }; > > /** > @@ -1534,9 +1537,33 @@ static int mma8452_probe(struct i2c_client *client, > mutex_init(&data->lock); > data->chip_info = match->data; > > + data->vdd_reg = devm_regulator_get(&client->dev, "vdd"); > + data->vddio_reg = devm_regulator_get(&client->dev, "vddio"); > + if (IS_ERR(data->vdd_reg) || IS_ERR(data->vddio_reg)) { > + if (PTR_ERR(data->vdd_reg) == -EPROBE_DEFER || > + PTR_ERR(data->vddio_reg) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + > + dev_err(&client->dev, "failed to get VDD/VDDIO regulator!\n"); > + return IS_ERR(data->vdd_reg) ? > + PTR_ERR(data->vdd_reg) : PTR_ERR(data->vddio_reg); This is overly complex. It'll be more lines of code, but I'd prefer you handle the two separately as the result will be more readable / less fragile. > + } > + > + ret = regulator_enable(data->vdd_reg); > + if (ret) { > + dev_err(&client->dev, "failed to enable VDD regulator!\n"); > + return ret; > + } > + > + ret = regulator_enable(data->vddio_reg); > + if (ret) { > + dev_err(&client->dev, "failed to enable VDDIO regulator!\n"); > + goto disable_regulator_vdd; > + } > + > 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 +1576,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 +1594,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 +1609,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 +1623,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 +1632,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 +1689,19 @@ static int mma8452_probe(struct i2c_client *client, > trigger_cleanup: > mma8452_trigger_cleanup(indio_dev); > > +disable_regulators: > + regulator_disable(data->vddio_reg); > + > +disable_regulator_vdd: > + regulator_disable(data->vdd_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); > > iio_device_unregister(indio_dev); > > @@ -1678,6 +1713,9 @@ static int mma8452_remove(struct i2c_client *client) > mma8452_trigger_cleanup(indio_dev); > mma8452_standby(iio_priv(indio_dev)); > > + regulator_disable(data->vddio_reg); > + regulator_disable(data->vdd_reg); > + > return 0; > } > > @@ -1696,6 +1734,18 @@ static int mma8452_runtime_suspend(struct device *dev) > return -EAGAIN; > } > > + ret = regulator_disable(data->vddio_reg); > + if (ret) { > + dev_err(dev, "failed to disable VDDIO regulator\n"); > + return ret; > + } > + > + ret = regulator_disable(data->vdd_reg); > + if (ret) { > + dev_err(dev, "failed to disable VDD regulator\n"); > + return ret; > + } > + > return 0; > } > > @@ -1705,9 +1755,22 @@ static int mma8452_runtime_resume(struct device *dev) > struct mma8452_data *data = iio_priv(indio_dev); > int ret, sleep_val; > > + ret = regulator_enable(data->vdd_reg); > + if (ret) { > + dev_err(dev, "failed to enable VDD regulator\n"); > + return ret; > + } > + > + ret = regulator_enable(data->vddio_reg); > + if (ret) { > + dev_err(dev, "failed to enable VDDIO regulator\n"); > + regulator_disable(data->vdd_reg); > + return ret; > + } > + > ret = mma8452_active(data); > if (ret < 0) > - return ret; > + goto runtime_resume_failed; > > ret = mma8452_get_odr_index(data); > sleep_val = 1000 / mma8452_samp_freq[ret][0]; > @@ -1717,25 +1780,17 @@ static int mma8452_runtime_resume(struct device *dev) > msleep_interruptible(sleep_val); > > return 0; > -} > -#endif > > -#ifdef CONFIG_PM_SLEEP > -static int mma8452_suspend(struct device *dev) > -{ > - return mma8452_standby(iio_priv(i2c_get_clientdata( > - to_i2c_client(dev)))); > -} > +runtime_resume_failed: > + regulator_disable(data->vddio_reg); > + regulator_disable(data->vdd_reg); > > -static int mma8452_resume(struct device *dev) > -{ > - return mma8452_active(iio_priv(i2c_get_clientdata( > - to_i2c_client(dev)))); > + return ret; > } > #endif > > static const struct dev_pm_ops mma8452_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(mma8452_suspend, mma8452_resume) > + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) > SET_RUNTIME_PM_OPS(mma8452_runtime_suspend, > mma8452_runtime_resume, NULL) > };