From patchwork Thu Oct 13 09:48:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 1998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp179991wrs; Thu, 13 Oct 2022 02:50:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5KJLJFBfozuUfpN2im31dpBrQ3SX6La6TxEodrdAR/AJ0fLDIlf+Z2zwCrgveMH1qJsEt+ X-Received: by 2002:a63:4f15:0:b0:455:ede1:d8c9 with SMTP id d21-20020a634f15000000b00455ede1d8c9mr29841446pgb.452.1665654628699; Thu, 13 Oct 2022 02:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665654628; cv=none; d=google.com; s=arc-20160816; b=t3FqtWyQW0HmI86iUQA7QPmzzVQMvTBOxxbQHeRy9lwh2Q98nEZ1/nfMT6EubFA8Gv EvZpKXWsNR1EOCI8Epa6FVta2qAObXMTCzHI1idzxTptXuKMRocFIC3XmGCNiWd3Y+wF fVIQUk2AsuPAm80fZjqWaBMe47St35DYr4mpPZHEzvWanE4SpcCD6Ai5HX0yGCAi3S9N XjnJSieesHG9mHjR1+TremeAItJm9ykQpg4iU50K1cxKIeaO+X6M13K2M4Wk2VHPDk4K 9IhIt1JgC6jbUE0xx93fxc+muQKRfTzQQnGAQKZ/2neGr20OwK/J4dIVbrV/05kvM/fK aMGw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XrFok4h2v8jURzBzEMcXB2G/WRQ1rwxuu8sh5z11Jc0=; b=bBh3Zvz639kJMwBBHGc+GeNJ0gakq4aM1lxlNELusTQa3JTMI9+Kg0qoY3GWLQIRKQ J8QZzGegmNFV43KYF6pmjwBv31A/mUe3JPVxjthvX+HuuSw95F93tE7zUurVyUtsMhOb HSv7p0yFraYYkNDLndp5VXmuLfjF4OVfhdJQgLBVNH41zgXq0Ns553XIllyQmnnYslsT NKRKAvOTQ946y6vMHlU8fk9UA1w9jSfL5dMZ4ilfdWrtgveEzP2+3/EItKcZFI8ffugj gt+1IJlFPpVo1Y2zREJ42bYz2GlP2oRe1EtNni9ffYfiNoXNJAV/LZwB6v6/ewqIpx0h h+TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=OhcZulsl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j1-20020a056a00234100b0052f80d1a588si7060718pfj.44.2022.10.13.02.50.16; Thu, 13 Oct 2022 02:50:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=OhcZulsl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229620AbiJMJsy (ORCPT + 99 others); Thu, 13 Oct 2022 05:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229544AbiJMJss (ORCPT ); Thu, 13 Oct 2022 05:48:48 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11267102DEC for ; Thu, 13 Oct 2022 02:48:47 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id 13so2735026ejn.3 for ; Thu, 13 Oct 2022 02:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XrFok4h2v8jURzBzEMcXB2G/WRQ1rwxuu8sh5z11Jc0=; b=OhcZulsln49JEb0d18L4nilP9WTYSDNOOMFBPXhjCQ1DRdUMDIex7Rut0SeVRW0VKI eJf/quec5C1j9pKwTkE/ZEEfHIWQzpkXrzIf49XmBx6vMfaFFyFfCs060SQTU5ruJ3wD WbHvErMVzD5cP4aRNk1YG2nd88nEUql0ioS5JTcQJGH0z3cDkXRHXtpcOsVUbk9a8G4r WJhSE/dAUWXu8erpY37QtMs7wZfn/y6VeDLr5ZnK5wePyZsqOr+e0GU6rwQx2g3Dzasv fDYPAO5dr+1To9AyElNn9t7OrJJDqvZ4jBM6OvgTqmThsB6pLZ1Xq2kGzLg+3+DErDkq jchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrFok4h2v8jURzBzEMcXB2G/WRQ1rwxuu8sh5z11Jc0=; b=Eyit9qylAg3i/s/1yuqJw1G1dSuXp4LMYnpnSfkHTPSQbD/d4BRqxcPv4vd7I77TAx A1so9Or+yITyS1D6+BUKO3rnMo75Vy354w3GehgR0yu82yD0GqttugLRymW1EdT4CxGF ad2sCySH2EEWB+0m/M5QLUsd8itB0pljAgetKT4/o5vcPxXqMiJoHSlJWPwNdbjLPcTv dHHwMaIBSI3U+hWnwUy8/nahros9WvnJvRtbS2cUxX27ZUxhaX/0OONAP6S6Ijmh/rsZ +7BO+YH7ifuhwf9o79kGSLRX9pzn3RSygeJgp08Qr8TnQHH8TqO8ltuOBM862FBh8lLE 3Npw== X-Gm-Message-State: ACrzQf1AACTTgaSbj4xqSo8XlSDv59G2TC1N140I6QM8SsZvBldnn2PX lg7z8QP8qsQXIyz49sKtGCc3Zw== X-Received: by 2002:a17:907:7207:b0:78d:9b37:8d0c with SMTP id dr7-20020a170907720700b0078d9b378d0cmr19650226ejc.717.1665654526610; Thu, 13 Oct 2022 02:48:46 -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 e14-20020a170906080e00b0078d25e0f74bsm2685353ejd.46.2022.10.13.02.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 02:48:46 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH v4 3/3] hwmon: (max6639) Change from pdata to dt configuration Date: Thu, 13 Oct 2022 11:48:38 +0200 Message-Id: <20221013094838.1529153-4-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> References: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746565468011982360?= X-GMAIL-MSGID: =?utf-8?q?1746565468011982360?= max6639_platform_data is not used by any in-kernel driver and does not address the MAX6639 fans separately. Move to device tree configuration with explicit properties to configure each fan. Non-DT platform can still use this module with its default configuration. Signed-off-by: Naresh Solanki --- drivers/hwmon/max6639.c | 206 +++++++++++++++++++++++++++++----------- 1 file changed, 153 insertions(+), 53 deletions(-) diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 9b895402c80d..bb6bcd61f34d 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -19,7 +19,6 @@ #include #include #include -#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END }; @@ -85,9 +84,9 @@ struct max6639_data { u8 temp_ot[2]; /* OT Temperature, 0..255 C (->_emergency) */ /* Register values initialized only once */ - u8 ppr; /* Pulses per rotation 0..3 for 1..4 ppr */ - u8 rpm_range; /* Index in above rpm_ranges table */ - + u8 ppr[2]; /* Pulses per rotation 0..3 for 1..4 ppr */ + u8 rpm_range[2]; /* Index in above rpm_ranges table */ + u8 pwm_polarity[2]; /* Fans PWM polarity, 0..1 */ /* Optional regulator for FAN supply */ struct regulator *reg; }; @@ -319,7 +318,7 @@ static ssize_t fan_input_show(struct device *dev, return PTR_ERR(data); return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index], - data->rpm_range)); + data->rpm_range[attr->index])); } static ssize_t alarm_show(struct device *dev, @@ -386,29 +385,40 @@ static struct attribute *max6639_attrs[] = { ATTRIBUTE_GROUPS(max6639); /* - * returns respective index in rpm_ranges table - * 1 by default on invalid range + * Get respective index in rpm_ranges table */ -static int rpm_range_to_reg(int range) +static int rpm_range_to_index(struct device *dev, u8 *index, int rpm) { - int i; - - for (i = 0; i < ARRAY_SIZE(rpm_ranges); i++) { - if (rpm_ranges[i] == range) - return i; + if (rpm < 0) + return -EINVAL; + + /* Set index based on chip support */ + switch (rpm) { + case 0 ... 2000: + *index = 0; + break; + case 2001 ... 4000: + *index = 1; + break; + case 4001 ... 8000: + *index = 2; + break; + case 8001 ... 16000: + *index = 3; + break; + default: + /* Use max range for higher RPM */ + dev_warn(dev, + "RPM higher than supported range. Default to 16000 RPM"); + *index = 3; } - - return 1; /* default: 4000 RPM */ + return 0; } static int max6639_init_client(struct i2c_client *client, struct max6639_data *data) { - struct max6639_platform_data *max6639_info = - dev_get_platdata(&client->dev); - int i; - int rpm_range = 1; /* default: 4000 RPM */ - int err; + int i, err; /* Reset chip to default values, see below for GCONFIG setup */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, @@ -416,51 +426,32 @@ static int max6639_init_client(struct i2c_client *client, if (err) goto exit; - /* Fans pulse per revolution is 2 by default */ - if (max6639_info && max6639_info->ppr > 0 && - max6639_info->ppr < 5) - data->ppr = max6639_info->ppr; - else - data->ppr = 2; - data->ppr -= 1; - - if (max6639_info) - rpm_range = rpm_range_to_reg(max6639_info->rpm_range); - data->rpm_range = rpm_range; - for (i = 0; i < 2; i++) { /* Set Fan pulse per revolution */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_PPR(i), - data->ppr << 6); + data->ppr[i] << 6); if (err) goto exit; /* Fans config PWM, RPM */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_CONFIG1(i), - MAX6639_FAN_CONFIG1_PWM | rpm_range); + MAX6639_FAN_CONFIG1_PWM | data->rpm_range[i]); if (err) goto exit; - /* Fans PWM polarity high by default */ - if (max6639_info && max6639_info->pwm_polarity == 0) - err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x00); - else - err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x02); - if (err) - goto exit; + /* Fans PWM polarity */ + err = i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i), data->pwm_polarity[i] ? 0x02 : 0x00); /* - * /THERM full speed enable, + * /THERM full speed disable, * PWM frequency 25kHz, see also GCONFIG below */ err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG3(i), - MAX6639_FAN_CONFIG3_THERM_FULL_SPEED | 0x03); + MAX6639_REG_FAN_CONFIG3(i), 0x03); if (err) goto exit; @@ -483,8 +474,6 @@ static int max6639_init_client(struct i2c_client *client, if (err) goto exit; - /* PWM 120/120 (i.e. 100%) */ - data->pwm[i] = 120; err = i2c_smbus_write_byte_data(client, MAX6639_REG_TARGTDUTY(i), data->pwm[i]); if (err) @@ -524,12 +513,91 @@ static void max6639_regulator_disable(void *data) regulator_disable(data); } +static int max6639_probe_child_from_dt(struct i2c_client *client, + struct device_node *child, + struct max6639_data *data) + +{ + struct device *dev = &client->dev; + u32 i, val, maxrpm; + int err; + + err = of_property_read_u32(child, "reg", &i); + if (err) { + dev_err(dev, "missing reg property of %pOFn\n", child); + return err; + } + + if (i >= 2) { + dev_err(dev, "invalid reg %d of %pOFn\n", i, child); + return -EINVAL; + } + + err = of_property_read_u32(child, "pulses-per-revolution", &val); + if (err) { + dev_err(dev, "missing pulses-per-revolution property of %pOFn\n", child); + return err; + } + + if (val < 0 || val > 5) { + dev_err(dev, "invalid pulses-per-revolution %d of %pOFn\n", val, child); + return -EINVAL; + } + data->ppr[i] = val; + + err = of_property_read_u32(child, "max-rpm", &maxrpm); + if (err) { + dev_err(dev, "missing max-rpm property of %pOFn\n", child); + return err; + } + + err = rpm_range_to_index(dev, &data->rpm_range[i], maxrpm); + if (err) { + dev_err(dev, "invalid max-rpm %d of %pOFn\n", maxrpm, child); + return err; + } + + err = of_property_read_u32(child, "target-rpm", &val); + /* Convert to PWM from provided target RPM */ + if (!err && val != 0 && maxrpm > 0) + data->pwm[i] = + (u8)(val * 120 / maxrpm); + + data->pwm_polarity[i] = of_property_read_bool(child, "pwm-polarity-inverse"); + + return 0; +} +static int max6639_probe_from_dt(struct i2c_client *client, struct max6639_data *data) +{ + struct device *dev = &client->dev; + const struct device_node *np = dev->of_node; + struct device_node *child; + int err; + + /* Compatible with non-DT platforms */ + if (!np) + return 0; + + for_each_child_of_node(np, child) { + if (strcmp(child->name, "fan")) + continue; + + err = max6639_probe_child_from_dt(client, child, data); + if (err) { + of_node_put(child); + return err; + } + } + + return 0; +} + static int max6639_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct max6639_data *data; struct device *hwmon_dev; - int err; + int err, i; data = devm_kzalloc(dev, sizeof(struct max6639_data), GFP_KERNEL); if (!data) @@ -539,9 +607,11 @@ static int max6639_probe(struct i2c_client *client) data->reg = devm_regulator_get_optional(dev, "fan"); if (IS_ERR(data->reg)) { - if (PTR_ERR(data->reg) != -ENODEV) - return PTR_ERR(data->reg); - + if (PTR_ERR(data->reg) != -ENODEV) { + err = (int)PTR_ERR(data->reg); + dev_warn(dev, "Failed looking up fan supply: %d\n", err); + return err; + } data->reg = NULL; } else { /* Spin up fans */ @@ -560,6 +630,25 @@ static int max6639_probe(struct i2c_client *client) mutex_init(&data->update_lock); + /* Below are defaults leter overridden by DT properties */ + for (i = 0; i < 2; i++) { + /* 4000 RPM */ + data->rpm_range[i] = 1; + data->ppr[i] = 2; + data->pwm_polarity[i] = 0; + /* Max. temp. 80C/90C/100C */ + data->temp_therm[i] = 80; + data->temp_alert[i] = 90; + data->temp_ot[i] = 100; + /* PWM 120/120 (i.e. 100%) */ + data->pwm[i] = 120; + } + + /* Probe from DT to get configuration */ + err = max6639_probe_from_dt(client, data); + if (err) + return err; + /* Initialize the max6639 chip */ err = max6639_init_client(client, data); if (err < 0) @@ -571,6 +660,7 @@ static int max6639_probe(struct i2c_client *client) return PTR_ERR_OR_ZERO(hwmon_dev); } +#if IS_ENABLED(CONFIG_PM_SLEEP) static int max6639_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -608,6 +698,7 @@ static int max6639_resume(struct device *dev) return i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); } +#endif static const struct i2c_device_id max6639_id[] = { {"max6639", 0}, @@ -616,13 +707,22 @@ static const struct i2c_device_id max6639_id[] = { MODULE_DEVICE_TABLE(i2c, max6639_id); -static DEFINE_SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); +#ifdef CONFIG_OF +static const struct of_device_id maxim_of_platform_match[] = { + {.compatible = "maxim,max6639"}, + {}, +}; +MODULE_DEVICE_TABLE(of, maxim_of_platform_match); +#endif + +static SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); static struct i2c_driver max6639_driver = { .class = I2C_CLASS_HWMON, .driver = { .name = "max6639", .pm = pm_sleep_ptr(&max6639_pm_ops), + .of_match_table = of_match_ptr(maxim_of_platform_match), }, .probe_new = max6639_probe, .id_table = max6639_id,