From patchwork Thu Oct 5 07:55:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 148916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp428335vqb; Thu, 5 Oct 2023 09:46:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYkCG0sPoOqZaT9r8HgucVcvu3mu7PsrNn4MXnH8NvG0MoprO3jDNotGJy31iohPcK/t5v X-Received: by 2002:a9d:5d17:0:b0:6c6:50d0:1104 with SMTP id b23-20020a9d5d17000000b006c650d01104mr5571798oti.27.1696524384783; Thu, 05 Oct 2023 09:46:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696524384; cv=none; d=google.com; s=arc-20160816; b=AtFC90BGqXN3MU768RN8popOaT1xfUJozTyQITD6L9XHMZ4/kPNkvCIMR3lpuQf7dt C4IcEqgdnKKW2pb5CXAiZQiqaM/vYdkoaqMa0Cyrhvn+eDlTgNAxYhO2bxp6ufFb9+Un KrlXffDSy7h+S6N8qKj5DoWwHpntNLH061CTdKB+d53T+ZJhC5W2XNLOuBlGYtcK7lIX MLTIzuct8CAYDmUv24RrnULs02ae10NCARg4UtlyJdTMtR+4ZSjEzKyV3/OP0pSu3XEg 5VTSphdWSi0yFYJgI63ibwQ+OITx9W1r3OEIVFJ4eXETQRAvVZ5Y0uA9lG0SwR0D2uuM +T8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=rIE9AYbwv3uO7JusWOFs6HN5AgKZjN9zYhECnYhLFZY=; fh=WqNDvLQiSF6bQDEiJKNH7g7BnFC12gLnu3gLZsGeAb8=; b=FnzlheCNexLSlQ8nooTYtOiIsefS+MyT08OS4IhgjTO3L9dc9jMJ+M3fSeBSpgqNwj ObPhfCkerTVlXdSpucBLn8EBmyrAVQJ+Zu7NyZsAIsCFnLzEukTiAKrY4qqplaIo4sNp F9UfoPKI/u1szzQ/8bi/bUNzIe9XjYnf57v5y0607jGsJxWnpaZgEkCUA81S8lfvlvSt APjPR+uiPK7Pp+MfR/BJR1GJXuQ5B9BgcMLE6zYIgz/7YibLtwnV2hT/7txsET4SW0h0 cwQ9sp3z4FwyW/XadqZZOYLzu5VIFGUTlaaiBG+gc5Gd64FS8ukiguwGqBshkgMaMTTl n14A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=SWib971N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 23-20020a630f57000000b0057759a5b7ccsi1781327pgp.305.2023.10.05.09.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:46:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=SWib971N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 550B9809D1D8; Thu, 5 Oct 2023 09:45:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233221AbjJEQm6 (ORCPT + 18 others); Thu, 5 Oct 2023 12:42:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233064AbjJEQkp (ORCPT ); Thu, 5 Oct 2023 12:40:45 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC2583C4 for ; Thu, 5 Oct 2023 00:55:16 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4065f29e933so6341555e9.1 for ; Thu, 05 Oct 2023 00:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1696492515; x=1697097315; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rIE9AYbwv3uO7JusWOFs6HN5AgKZjN9zYhECnYhLFZY=; b=SWib971NI2mAcO9WQzSqQJQoEGTiGRGupJTSJKrxh+N0kHUnh6uwpXrt+OjBiG2Qpy SOVQzNySLDdXB3f9map5ISUZk+nvdn6zJpvGK2LSlPC3DsxPq6vkFKr7KmQe4mHmY9I0 gUjzRVQ/QeyCuHKJljyTZfhrHJf9WurzSxX+QrIMGeOVumy0XdlxRNZ5PkLWGtlhMwO/ Qsjao2Tjwc+HsEQ8tK+BqboZUA0K9q0hbDDektpr7XT3YR1atpZgfH5mpnf2FxxmHtBN EQUMam5T7U41u1u82fCDrNDTRUbf9n0NZ7Oaki9vdhiskPGaevJ3zxEPLJyaYzY+3ZQg dhKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696492515; x=1697097315; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rIE9AYbwv3uO7JusWOFs6HN5AgKZjN9zYhECnYhLFZY=; b=eFpDp4kUj1w+egQj1vwpO5fSD806EOBclAVS0pnsQgYKCUeQ9xod5H+NJgwjvYs5Zj 9O+Fc+FrWHD1O/emtiBb044lN0XMO7xBRP/JvvL/n2PB3r3IXRVCsX5MnpglBffY2aQ9 j2L3YfQeE4YVzaIpJAyScj66/1Zfpaoyvxtu/uAQbB1jdrniaac7H+tB61s4sMFQ9cYX oRBnGrLFBclbogySi1fvfTprmnLRuwS/uMINfimqbAkg26jNkC7PpJ/8OsyCI6H85Iip YL8MXeQ8zi+K4DuTgK7ipETJ5sR0mfAP8nByKl5kM1ukAZFJDgagWs/E9p11jLsU6Jw5 NB5w== X-Gm-Message-State: AOJu0Yz/AJrLD/Nlr2ajgj0/NXo+GtlEQzAkVxuQhUBnz5KOWx6mVYEG q3aDEnj8ukTAac9Sfl+bVcYlXw== X-Received: by 2002:a05:600c:44f:b0:3fe:1f93:8cf4 with SMTP id s15-20020a05600c044f00b003fe1f938cf4mr4317110wmb.8.1696492514545; Thu, 05 Oct 2023 00:55:14 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id s17-20020a1cf211000000b00405623e0186sm3178648wmc.26.2023.10.05.00.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 00:55:14 -0700 (PDT) From: Naresh Solanki To: broonie@kernel.org, zev@bewilderbeest.net, Liam Girdwood , Jean Delvare , Guenter Roeck Cc: Naresh Solanki , linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org Subject: [PATCH v5] regulator (max5970): Add hwmon support Date: Thu, 5 Oct 2023 09:55:07 +0200 Message-ID: <20231005075508.1656071-1-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 05 Oct 2023 09:45:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778934753141807926 X-GMAIL-MSGID: 1778934753141807926 Utilize the integrated 10-bit ADC in Max5970/Max5978 to enable voltage and current monitoring. This feature is seamlessly integrated through the hwmon subsystem. Signed-off-by: Naresh Solanki --- Changes in V5: - Simplify memory allocation for rdevs Changes in V4: - Use IS_REACHABLE - Use rdevs array for hwmon ops. - Remove duplicate i2c_set_clientdata Changes in V3: - Update signed-off - Add break - Update hwmon dev register name to max5970 - Remove changes in Kconfig. Changes in V2: - default case added for switch statement - Add dependency on HWMON --- drivers/regulator/max5970-regulator.c | 141 +++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) base-commit: f9a1d31874c383f58bb4f89bfe79b764682cd026 diff --git a/drivers/regulator/max5970-regulator.c b/drivers/regulator/max5970-regulator.c index b56a174cde3d..71b4a543339a 100644 --- a/drivers/regulator/max5970-regulator.c +++ b/drivers/regulator/max5970-regulator.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -32,6 +33,128 @@ enum max597x_regulator_id { MAX597X_SW1, }; +static int max5970_read_adc(struct regmap *regmap, int reg, long *val) +{ + u8 reg_data[2]; + int ret; + + ret = regmap_bulk_read(regmap, reg, ®_data[0], 2); + if (ret < 0) + return ret; + + *val = (reg_data[0] << 2) | (reg_data[1] & 3); + + return 0; +} + +static int max5970_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + struct regulator_dev **rdevs = dev_get_drvdata(dev); + struct max5970_regulator *ddata = rdev_get_drvdata(rdevs[channel]); + struct regmap *regmap = ddata->regmap; + int ret; + + switch (type) { + case hwmon_curr: + switch (attr) { + case hwmon_curr_input: + ret = max5970_read_adc(regmap, MAX5970_REG_CURRENT_H(channel), val); + /* + * Calculate current from ADC value, IRNG range & shunt resistor value. + * ddata->irng holds the voltage corresponding to the maximum value the + * 10-bit ADC can measure. + * To obtain the output, multiply the ADC value by the IRNG range (in + * millivolts) and then divide it by the maximum value of the 10-bit ADC. + */ + *val = (*val * ddata->irng) >> 10; + /* Convert the voltage meansurement across shunt resistor to current */ + *val = (*val * 1000) / ddata->shunt_micro_ohms; + return ret; + default: + return -EOPNOTSUPP; + } + + case hwmon_in: + switch (attr) { + case hwmon_in_input: + ret = max5970_read_adc(regmap, MAX5970_REG_VOLTAGE_H(channel), val); + /* + * Calculate voltage from ADC value and MON range. + * ddata->mon_rng holds the voltage corresponding to the maximum value the + * 10-bit ADC can measure. + * To obtain the output, multiply the ADC value by the MON range (in + * microvolts) and then divide it by the maximum value of the 10-bit ADC. + */ + *val = mul_u64_u32_shr(*val, ddata->mon_rng, 10); + /* uV to mV */ + *val = *val / 1000; + return ret; + default: + return -EOPNOTSUPP; + } + default: + return -EOPNOTSUPP; + } +} + +static umode_t max5970_is_visible(const void *data, + enum hwmon_sensor_types type, + u32 attr, int channel) +{ + struct regulator_dev **rdevs = (struct regulator_dev **)data; + struct max5970_regulator *ddata; + + if (channel >= MAX5970_NUM_SWITCHES || !rdevs[channel]) + return 0; + + ddata = rdev_get_drvdata(rdevs[channel]); + + if (!ddata || channel >= ddata->num_switches) + return 0; + + switch (type) { + case hwmon_in: + switch (attr) { + case hwmon_in_input: + return 0444; + default: + break; + } + break; + case hwmon_curr: + switch (attr) { + case hwmon_curr_input: + /* Current measurement requires knowledge of the shunt resistor value. */ + if (ddata->shunt_micro_ohms) + return 0444; + break; + default: + break; + } + break; + default: + break; + } + return 0; +} + +static const struct hwmon_ops max5970_hwmon_ops = { + .is_visible = max5970_is_visible, + .read = max5970_read, +}; + +static const struct hwmon_channel_info *max5970_info[] = { + HWMON_CHANNEL_INFO(in, HWMON_I_INPUT, HWMON_I_INPUT), + HWMON_CHANNEL_INFO(curr, HWMON_C_INPUT, HWMON_C_INPUT), + NULL +}; + +static const struct hwmon_chip_info max5970_chip_info = { + .ops = &max5970_hwmon_ops, + .info = max5970_info, +}; + static int max597x_uvp_ovp_check_mode(struct regulator_dev *rdev, int severity) { int ret, reg; @@ -431,7 +554,8 @@ static int max597x_regulator_probe(struct platform_device *pdev) struct i2c_client *i2c = to_i2c_client(pdev->dev.parent); struct regulator_config config = { }; struct regulator_dev *rdev; - struct regulator_dev *rdevs[MAX5970_NUM_SWITCHES]; + struct regulator_dev **rdevs = NULL; + struct device *hwmon_dev; int num_switches; int ret, i; @@ -442,6 +566,11 @@ static int max597x_regulator_probe(struct platform_device *pdev) if (!max597x) return -ENOMEM; + rdevs = devm_kcalloc(&i2c->dev, MAX5970_NUM_SWITCHES, sizeof(struct regulator_dev *), + GFP_KERNEL); + if (!rdevs) + return -ENOMEM; + i2c_set_clientdata(i2c, max597x); if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978")) @@ -451,7 +580,6 @@ static int max597x_regulator_probe(struct platform_device *pdev) else return -ENODEV; - i2c_set_clientdata(i2c, max597x); num_switches = max597x->num_switches; for (i = 0; i < num_switches; i++) { @@ -485,6 +613,15 @@ static int max597x_regulator_probe(struct platform_device *pdev) max597x->shunt_micro_ohms[i] = data->shunt_micro_ohms; } + if (IS_REACHABLE(CONFIG_HWMON)) { + hwmon_dev = devm_hwmon_device_register_with_info(&i2c->dev, "max5970", rdevs, + &max5970_chip_info, NULL); + if (IS_ERR(hwmon_dev)) { + return dev_err_probe(&i2c->dev, PTR_ERR(hwmon_dev), + "Unable to register hwmon device\n"); + } + } + if (i2c->irq) { ret = max597x_setup_irq(&i2c->dev, i2c->irq, rdevs, num_switches,