Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp107504ybb; Fri, 27 Mar 2020 17:12:44 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu979Onxh5dXe7FAPQpm5aNMMzVxH8O4iuVBlRwILGKrZx0oGg7lxcAexQ7Wzk9/AGz+emO X-Received: by 2002:a05:6830:4013:: with SMTP id h19mr1064413ots.100.1585354363913; Fri, 27 Mar 2020 17:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585354363; cv=none; d=google.com; s=arc-20160816; b=lx8tJsmiacoyineNy6VuMQ5JFOOKXHnQz7jx87lZYCukLkoT1ABblE5Grq7ztvkBHM kd2NehLvMFL2qsKkCcQXVDlaxcOQqCnVwPSfCc/rLV+sVw8nj93XPUoSoS8ZETc65bqq rEaShz02E+ZgSPSbrQJrfooVIyFTfAceOZMPE3ym0alNtY514gt9PGwXsodE+cxJKDpX JPm6anNR7XN7gT46SXg7/PKkSWuEQAL6xDgvJuJ3zIwPURo34Z8bsuGgANn/KGjcUgeE +s4xx61eO7M0xUAcClUlvnXxru50ZsH1ilgIQ2Ti3G8WoqdUiBjJX/0lCk4txl/oYPb2 82Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=RceJC+cTIkf802wa7Woh4q1KPRpiQp86eGTQzwfdNCw=; b=EosogXbIH8371rPospLjqERSlg3nvaLqhyxNx5cDhOtgsi5PyXgf669naPBbPtjksD TTv8tAHVBwbzNtV3xHI3/h13E9YWVt8Riy2nbOq8vLz+a9xlhWEke0JE52H3Xn3z8/aZ XOjVGKc/P3CnKfXTckKsyO44NITwFUFI2IpwcLE7qDvzuP/eL7o1CAEoR6WjkYDDNgPv 9Og7uqZxcHgJySkCe2UZ77DiieCI0qSPH3WXgvGubjXF7qG2sCJgUjuK+mf4HU4f7S60 h87mU7opRuhPLLi+J8VHoxdIUi8jgD2A/TQwS2HpYnKUEE52giBNYMeGuMA+ILJWFrft VBOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Bco/xp1v"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si3076810oti.202.2020.03.27.17.12.31; Fri, 27 Mar 2020 17:12:43 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b="Bco/xp1v"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727302AbgC1AML (ORCPT + 99 others); Fri, 27 Mar 2020 20:12:11 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39929 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727173AbgC1AMK (ORCPT ); Fri, 27 Mar 2020 20:12:10 -0400 Received: by mail-wr1-f67.google.com with SMTP id p10so13865341wrt.6; Fri, 27 Mar 2020 17:12:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RceJC+cTIkf802wa7Woh4q1KPRpiQp86eGTQzwfdNCw=; b=Bco/xp1v9W3xdUUoLDrEiVu0p5FwF43VDaudThL17Tm4c2T2wFF/q0VCmC37DdNrvM f0IQSXVg5DmBUHY6QTVImPLHMZ3JNo4zkcraeRWLBhUYu9hY3GdKbhWZgPwcEXk48KZj oxF32WlEkN5svSGefTB4WDqurbHFATq95sYIUDP2XGt77OnLeYkg42GjausnBe53FDx6 ILDWxOrcEhKs/qO8Tj3voSsDil6/ASTrj8Mrc8uFBtZYLF2lGkNUufiUme4tTMjq7GPw 3V02SKo0n9yOsII2dLAPkvA4Az12OK3ymOi84/Il0hjD64H9RuS69sjyHJ5y9ZII5KBA XuGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RceJC+cTIkf802wa7Woh4q1KPRpiQp86eGTQzwfdNCw=; b=XWc54PzIFua6hZerZos30hkzlsPaehbQwwt+wVmeioHIKSMor6A7a3dd+WM9JC/QXe seYbuyojaO5j2ThqMt5n33Xg3lzmx3c5zX2oyDA+/Eb2+YvChgM5+kqUNg44huOHnmIX MBnlKaQfgMHxf8f1jj3ueulFXfALMQGvR10hQ77Xt5p6Jns2WkT8XO92pQEWrqlAuKeW YPUe1DEhAHz57w1dp07J5BJ8jbomuTynCCrxjDfA3grUJq6TV6gS319PPRd3G2qHLbQM VAdZ6zUIvuDyIN3qf2q0OIQzKwr9GHG8YkKczjNNyMpQ8DB6FrRG1JZnqiQKdzY44JVv PJ4w== X-Gm-Message-State: ANhLgQ3fp9C+HkZAxPQzTJhsMZOCr697hv5Lt8dkHPFT50W5Buvd7wID xtSH1LI0PS/Akt6fQsBqGdI= X-Received: by 2002:adf:e492:: with SMTP id i18mr2073587wrm.316.1585354328034; Fri, 27 Mar 2020 17:12:08 -0700 (PDT) Received: from localhost.localdomain (p5B3F7536.dip0.t-ipconnect.de. [91.63.117.54]) by smtp.gmail.com with ESMTPSA id 61sm11237956wrn.82.2020.03.27.17.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 17:12:07 -0700 (PDT) From: Saravanan Sekar To: lee.jones@linaro.org, andy.shevchenko@gmail.com, robh+dt@kernel.org, jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, sre@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-pm@vger.kernel.org, Saravanan Sekar Subject: [PATCH v5 3/5] iio: adc: mp2629: Add support for mp2629 ADC driver Date: Sat, 28 Mar 2020 01:11:52 +0100 Message-Id: <20200328001154.17313-4-sravanhome@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200328001154.17313-1-sravanhome@gmail.com> References: <20200328001154.17313-1-sravanhome@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for 8-bit resolution ADC readings for input power supply and battery charging measurement. Provides voltage, current readings to mp2629 power supply driver. Signed-off-by: Saravanan Sekar --- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/mp2629_adc.c | 209 +++++++++++++++++++++++++++++++++++ include/linux/mfd/mp2629.h | 9 ++ 4 files changed, 229 insertions(+) create mode 100644 drivers/iio/adc/mp2629_adc.c diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 82e33082958c..ef0c0cd31855 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -680,6 +680,16 @@ config MESON_SARADC To compile this driver as a module, choose M here: the module will be called meson_saradc. +config MP2629_ADC + tristate "Monolithic MP2629 ADC driver" + depends on MFD_MP2629 + help + Say yes to have support for battery charger IC MP2629 ADC device + accessed over I2C. + + This driver provides ADC conversion of system, input power supply + and battery voltage & current information. + config NAU7802 tristate "Nuvoton NAU7802 ADC driver" depends on I2C diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 919228900df9..f14416c245a6 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_MCP3911) += mcp3911.o obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o obj-$(CONFIG_MESON_SARADC) += meson_saradc.o +obj-$(CONFIG_MP2629_ADC) += mp2629_adc.o obj-$(CONFIG_MXS_LRADC_ADC) += mxs-lradc-adc.o obj-$(CONFIG_NAU7802) += nau7802.o obj-$(CONFIG_NPCM_ADC) += npcm_adc.o diff --git a/drivers/iio/adc/mp2629_adc.c b/drivers/iio/adc/mp2629_adc.c new file mode 100644 index 000000000000..39a421026dff --- /dev/null +++ b/drivers/iio/adc/mp2629_adc.c @@ -0,0 +1,209 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * MP2629 Driver for ADC + * + * Copyright 2020 Monolithic Power Systems, Inc + * + * Author: Saravanan Sekar + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define MP2629_REG_ADC_CTRL 0x03 +#define MP2629_REG_BATT_VOLT 0x0e +#define MP2629_REG_SYSTEM_VOLT 0x0f +#define MP2629_REG_INPUT_VOLT 0x11 +#define MP2629_REG_BATT_CURRENT 0x12 +#define MP2629_REG_INPUT_CURRENT 0x13 + +#define MP2629_ADC_START BIT(7) +#define MP2629_ADC_CONTINUOUS BIT(6) + +#define MP2629_MAP(_mp, _mpc) IIO_MAP(#_mp, "mp2629_charger", "mp2629-"_mpc) + +#define MP2629_ADC_CHAN(_ch, _type) { \ + .type = _type, \ + .indexed = 1, \ + .datasheet_name = #_ch, \ + .channel = MP2629_ ## _ch, \ + .address = MP2629_REG_ ## _ch, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ +} + +struct mp2629_adc { + struct regmap *regmap; + struct device *dev; +}; + +static struct iio_chan_spec mp2629_channels[] = { + MP2629_ADC_CHAN(BATT_VOLT, IIO_VOLTAGE), + MP2629_ADC_CHAN(SYSTEM_VOLT, IIO_VOLTAGE), + MP2629_ADC_CHAN(INPUT_VOLT, IIO_VOLTAGE), + MP2629_ADC_CHAN(BATT_CURRENT, IIO_CURRENT), + MP2629_ADC_CHAN(INPUT_CURRENT, IIO_CURRENT) +}; + +static struct iio_map mp2629_adc_maps[] = { + MP2629_MAP(BATT_VOLT, "batt-volt"), + MP2629_MAP(SYSTEM_VOLT, "system-volt"), + MP2629_MAP(INPUT_VOLT, "input-volt"), + MP2629_MAP(BATT_CURRENT, "batt-current"), + MP2629_MAP(INPUT_CURRENT, "input-current") +}; + +static int mp2629_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct mp2629_adc *info = iio_priv(indio_dev); + unsigned int rval; + int ret; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + ret = regmap_read(info->regmap, chan->address, &rval); + if (ret < 0) + return ret; + + if (chan->address == MP2629_INPUT_VOLT) + rval &= GENMASK(6, 0); + *val = rval; + return IIO_VAL_INT; + + case IIO_CHAN_INFO_SCALE: + switch (chan->channel) { + case MP2629_BATT_VOLT: + case MP2629_SYSTEM_VOLT: + *val = 20; + return IIO_VAL_INT; + + case MP2629_INPUT_VOLT: + *val = 60; + return IIO_VAL_INT; + + case MP2629_BATT_CURRENT: + *val = 175; + *val2 = 10; + return IIO_VAL_FRACTIONAL; + + case MP2629_INPUT_CURRENT: + *val = 133; + *val2 = 10; + return IIO_VAL_FRACTIONAL; + + default: + return -EINVAL; + } + + default: + return -EINVAL; + } + + return 0; +} + +static const struct iio_info mp2629_adc_info = { + .read_raw = &mp2629_read_raw, +}; + +static int mp2629_adc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct mp2629_info *ddata = dev_get_drvdata(dev->parent); + struct mp2629_adc *info; + struct iio_dev *indio_dev; + int ret; + + indio_dev = devm_iio_device_alloc(dev, sizeof(*info)); + if (!indio_dev) + return -ENOMEM; + + info = iio_priv(indio_dev); + info->regmap = ddata->regmap; + info->dev = dev; + platform_set_drvdata(pdev, indio_dev); + + ret = iio_map_array_register(indio_dev, mp2629_adc_maps); + if (ret) { + dev_err(dev, "IIO maps register fail: %d\n", ret); + return ret; + } + + indio_dev->name = dev_name(dev); + indio_dev->dev.parent = dev; + indio_dev->channels = mp2629_channels; + indio_dev->num_channels = ARRAY_SIZE(mp2629_channels); + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->info = &mp2629_adc_info; + + ret = regmap_update_bits(ddata->regmap, MP2629_REG_ADC_CTRL, + MP2629_ADC_START | MP2629_ADC_CONTINUOUS, + MP2629_ADC_START | MP2629_ADC_CONTINUOUS); + if (ret) { + dev_err(dev, "adc enable fail: %d\n", ret); + goto fail_unmap; + } + + ret = devm_iio_device_register(dev, indio_dev); + if (ret) { + dev_err(dev, "IIO device register fail: %d\n", ret); + goto fail_disable; + } + + return 0; + +fail_disable: + regmap_update_bits(ddata->regmap, MP2629_REG_ADC_CTRL, + MP2629_ADC_CONTINUOUS, 0); + regmap_update_bits(ddata->regmap, MP2629_REG_ADC_CTRL, + MP2629_ADC_START, 0); + +fail_unmap: + iio_map_array_unregister(indio_dev); + + return ret; +} + +static int mp2629_adc_remove(struct platform_device *pdev) +{ + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + struct mp2629_adc *info = iio_priv(indio_dev); + + regmap_update_bits(info->regmap, MP2629_REG_ADC_CTRL, + MP2629_ADC_CONTINUOUS, 0); + regmap_update_bits(info->regmap, MP2629_REG_ADC_CTRL, + MP2629_ADC_START, 0); + + iio_map_array_unregister(indio_dev); + iio_device_unregister(indio_dev); + + return 0; +} + +static const struct of_device_id mp2629_adc_of_match[] = { + { .compatible = "mps,mp2629_adc"}, + {} +}; +MODULE_DEVICE_TABLE(of, mp2629_adc_of_match); + +static struct platform_driver mp2629_adc_driver = { + .driver = { + .name = "mp2629_adc", + .of_match_table = mp2629_adc_of_match, + }, + .probe = mp2629_adc_probe, + .remove = mp2629_adc_remove, +}; +module_platform_driver(mp2629_adc_driver); + +MODULE_AUTHOR("Saravanan Sekar "); +MODULE_DESCRIPTION("MP2629 ADC driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/mfd/mp2629.h b/include/linux/mfd/mp2629.h index 7f071f1f352b..cf4ec4febefe 100644 --- a/include/linux/mfd/mp2629.h +++ b/include/linux/mfd/mp2629.h @@ -17,4 +17,13 @@ struct mp2629_info { struct regmap *regmap; }; +enum mp2629_adc_chan { + MP2629_BATT_VOLT, + MP2629_SYSTEM_VOLT, + MP2629_INPUT_VOLT, + MP2629_BATT_CURRENT, + MP2629_INPUT_CURRENT, + MP2629_ADC_CHAN_END +}; + #endif -- 2.17.1