From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE6CFC4332F for ; Wed, 12 Oct 2022 21:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229620AbiJLViW (ORCPT ); Wed, 12 Oct 2022 17:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229617AbiJLViS (ORCPT ); Wed, 12 Oct 2022 17:38:18 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2752120EF6; Wed, 12 Oct 2022 14:38:16 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id t12-20020a17090a3b4c00b0020b04251529so198833pjf.5; Wed, 12 Oct 2022 14:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:sender :from:to:cc:subject:date:message-id:reply-to; bh=sO3gEbUIEn4UzyfcUgdWPOCEpD59j6vf3ODast5+CcE=; b=FlEn9F/3EZDsFq2x9iG3yZAnp86patujE7RHhLWjoR1IUveQI60gBY1c4WahXpC6AG sDXIZHW+00Xp/wpy3iGBDi8eWoEJ/M/u4Bismk2eeEpUYqBBJJw2KnEZF8gbgzrIRXQk RViaIMfxPScfWZEyTQ56t5i9jEmfMw796WH8gSlcqAGXsPus6zEtghxr3gzsHkejbYXn tAL/UwJbhpsNA4/xLJoIHCxL6LLmdyIhbXD0MzcE38xlCQA0VmmL3YwYF8WUJKxJcH6B PHcfNvGxsVvOw6K56qHUPW6nLt9g0Bqw6omrXFxkFFSlns1jRVZ3obceHdGx5cMEs65b oLJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sO3gEbUIEn4UzyfcUgdWPOCEpD59j6vf3ODast5+CcE=; b=uXjiHDsFI395u9HdiodsTuX1nfKiMJDj/BDYV1OhoNGwfUtubn9fYzArXcYPiee57i /TazVRlrYXQR82SdMJGuYHMsXTx9MKqvWy6rPK68Gad8MysSWYS0HzM98eJDWgZw7Hs8 kraBeCYdYT3rAxsV50dqo2kv4F0XxkyOFCSkJXYAeCXc5cK1+stkkA0klF8+Uaniwn2c Pd1Vu8QeI3zxKM/mNW8+beVIGph2EbIZgS27hKEqb5ZK3F3VjwlnWX762MdGnZqKi0Pq Hn5AgPDxyCt+z0euOnnfhKcfUB+BfA7bcmWijVU4FxfmU4/8JwRmRL63cSOt63VtjVgz UPeQ== X-Gm-Message-State: ACrzQf2byovCpm7RlLVIcjcq7LHu8k523AjqwSrZH2LB6+rBvKshi+qA y/kUzoSKhO0jkFWdJ+lD1+6xsvFDNxD3HQ== X-Google-Smtp-Source: AMsMyM7/xma7+NEoACQqYy2Fz/4gViUkDgDhA6K4Uav9Pg2HfwpvCHOQshMQsiSNOOac5s41mbayYQ== X-Received: by 2002:a17:902:c241:b0:182:a32f:4db7 with SMTP id 1-20020a170902c24100b00182a32f4db7mr16928578plg.131.1665610696009; Wed, 12 Oct 2022 14:38:16 -0700 (PDT) Received: from ?IPV6:2600:1700:e321:62f0:329c:23ff:fee3:9d7c? ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 69-20020a630048000000b0042988a04bfdsm10004711pga.9.2022.10.12.14.38.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Oct 2022 14:38:15 -0700 (PDT) Sender: Guenter Roeck Message-ID: <7f2056b9-5f9d-d0d0-adb9-d2c18dda137c@roeck-us.net> Date: Wed, 12 Oct 2022 14:38:13 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Naresh Solanki , devicetree@vger.kernel.org, Jean Delvare Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph References: <20221012205736.1231514-1-Naresh.Solanki@9elements.com> <20221012205736.1231514-4-Naresh.Solanki@9elements.com> From: Guenter Roeck Subject: Re: [PATCH v3 3/3] hwmon: (max6639) Change from pdata to dt configuration In-Reply-To: <20221012205736.1231514-4-Naresh.Solanki@9elements.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 10/12/22 13:57, Naresh Solanki wrote: > 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 | 205 +++++++++++++++++++++++++++++----------- > 1 file changed, 152 insertions(+), 53 deletions(-) > > diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c > index 9b895402c80d..2fc096a00e21 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,39 @@ 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."); It is illogical to complain about that but not about other invalid values. > + *index = 3; > } > - > - return 1; /* default: 4000 RPM */ > + return 0; The return value can be used both as error indicator (return value < 0) and index (return value >= 0). It is not necessary to introduce a pointer. > } > > 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 +425,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 +473,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 +512,92 @@ 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; > + } > + > + Dual empty line. > + err = of_property_read_u32(child, "target-rpm", &val); > + /* Convert to PWM from provided target RPM */ > + if (!err && val != 0) > + data->pwm[i] = > + (u8)(val * 120 / maxrpm); > + It is not acceptable for any of those missing properties to result in errors. Use current chip values as default if values are not provided. > + 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); This is an unrelated change. It is not common to issue a warning in that situation, and I am not inclined to accept it. Besides, the function can return -EPROBE_DEFER, and any messages associated with that are unacceptable. > + return err; > + } > data->reg = NULL; > } else { > /* Spin up fans */ > @@ -560,6 +630,24 @@ static int max6639_probe(struct i2c_client *client) > > mutex_init(&data->update_lock); > > + /* default values */ > + for (i = 0; i < 2; i++) { > + /* 4000 RPM */ > + data->rpm_range[i] = 1; > + data->ppr[i] = 2; > + data->pwm_polarity[i] = 1; > + /* 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; > + } As I said, defaults are values currently programmed into the chip, not some random values. > + > + 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 +659,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 +697,7 @@ static int max6639_resume(struct device *dev) > return i2c_smbus_write_byte_data(client, > MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); > } > +#endif This can be done without #ifdef. > > static const struct i2c_device_id max6639_id[] = { > {"max6639", 0}, > @@ -616,13 +706,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,