From patchwork Thu Jul 7 16:12:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 12909915 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 1F6A6C43334 for ; Thu, 7 Jul 2022 16:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235994AbiGGQNu (ORCPT ); Thu, 7 Jul 2022 12:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236137AbiGGQN3 (ORCPT ); Thu, 7 Jul 2022 12:13:29 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A3ED57234 for ; Thu, 7 Jul 2022 09:13:04 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id n4so13997016ejz.10 for ; Thu, 07 Jul 2022 09:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uk09BlwOpNIFnr0TLlj84WdNCQ/gGDBSTpndzRxAxsg=; b=L7j7JzFfJItXTVX0KZ1SZx7ZsGJ3QX4nT7QKfOwD7r7e1vMCM8Z5UHx68QiJdVqml/ aOobi0PD+u04zzjCh+I8h0gViMEUzaijaowSW7hTv5At99PHShLEftNAK1D2sWOfQk0V z25Bqp6V14HSXZKdpSFePyA6qR5Rg9HrMqhi8QwY0lLxBqKaGxFdtQxOR7tB16r8Ic07 XC+v7IqDUuhVIMqsV2kQVqnCLUuRf0wTu4/qk7hiBJzaKS0OZ/ITDgRteCurA7LwWv01 a828DiJUnzMpzIa1HPY5+5SMYCRkosPVNh9tRXj1ffSSU0cAWFv0O1yvxiYEHqzbe/rW g8hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uk09BlwOpNIFnr0TLlj84WdNCQ/gGDBSTpndzRxAxsg=; b=wTUx0ds+fkIZRxmd7BKlu5cPi5dZzlDFDdq1FgOF2RIfTW1Lt8QWeRsx6hIVgxcUCA EYskyFnOsYdt7fdGqEL+OLgnfkjCmCAnAly0HLSmA0z6JUHPKbZeTY77k/BOm9wk31Fj 60pb/zofuJNi63hH1jXz+UMiwnQnNuC5L95sTp7fPj4nTGhYonisZ2zTaIwyNJVEQWTK obZzljbjt9t5AqEj/1aDwGqGwU47L/90Dx4TAZ5R2mwrfulO6sJk2/55tfsEGaBlUvg8 zFWfBCiV8khf3O0TFQ8NcLAEoMgPj10btKCS9WnpkuoPUUX3FJTXKX4CtdzSAE9il675 cndw== X-Gm-Message-State: AJIora9W7P/DSeVXhX/mipJQhhqSkuN+hAIrtEHeTtnjaYNHworekZA2 Krhjyz7cIcxEdctMvT61Exhp9yB6y7Vo357x X-Google-Smtp-Source: AGRyM1sEwswyh1YeD+DiKT1A/34d95KV/kMMtpxn/agxo1OwwsjeUBR6iROutoOjlkRaIVv/nxXRIQ== X-Received: by 2002:a17:907:7d8b:b0:726:aad6:f421 with SMTP id oz11-20020a1709077d8b00b00726aad6f421mr44450191ejc.80.1657210382617; Thu, 07 Jul 2022 09:13:02 -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 ia10-20020a170907a06a00b0070b7875aa6asm18916727ejc.166.2022.07.07.09.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 09:13:02 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: linux-hwmon@vger.kernel.org, Jean Delvare , Guenter Roeck Cc: Marcello Sylvester Bauer , Naresh Solanki Subject: [PATCH 2/2] hwmon: (max6639) Change from pdata to dt configuration Date: Thu, 7 Jul 2022 18:12:44 +0200 Message-Id: <20220707161245.1229280-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220707161245.1229280-2-Naresh.Solanki@9elements.com> References: <20220707161245.1229280-2-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Marcello Sylvester Bauer max6639_platform_data is not used by any in-kernel driver and does not address the MAX6639 channels separately. Move to device tree configuration with explicit properties to configure each channel. Non-DT platform can still use this module with its default configuration. Signed-off-by: Marcello Sylvester Bauer Signed-off-by: Naresh Solanki --- drivers/hwmon/max6639.c | 162 +++++++++++++++++++------- include/linux/platform_data/max6639.h | 15 --- 2 files changed, 119 insertions(+), 58 deletions(-) delete mode 100644 include/linux/platform_data/max6639.h diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 14bb7726f8d7..4e8c3d3ec4fd 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,8 +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 +319,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,28 +386,26 @@ 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(u8 *index, int range) { int i; for (i = 0; i < ARRAY_SIZE(rpm_ranges); i++) { - if (rpm_ranges[i] == range) - return i; + if (rpm_ranges[i] == range) { + *index = i; + return 0; + } } - return 1; /* default: 4000 RPM */ + return -EINVAL; } 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; /* Reset chip to default values, see below for GCONFIG setup */ @@ -416,43 +414,25 @@ 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] ? 0x00 : 0x02); /* * /THERM full speed enable, @@ -464,10 +444,6 @@ static int max6639_init_client(struct i2c_client *client, if (err) goto exit; - /* Max. temp. 80C/90C/100C */ - data->temp_therm[i] = 80; - data->temp_alert[i] = 90; - data->temp_ot[i] = 100; err = i2c_smbus_write_byte_data(client, MAX6639_REG_THERM_LIMIT(i), data->temp_therm[i]); @@ -483,8 +459,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 +498,87 @@ 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; + 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) { + 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, "maxim,rpm-range", &val); + if (!err) { + err = rpm_range_to_index(&data->rpm_range[i], val); + if (err) { + dev_err(dev, "invalid maxim,rpm-range %d of %pOFn\n", val, child); + return err; + } + } + + err = of_property_read_u32(child, "pwm-polarity", &val); + if (!err) { + if (val > 1) { + dev_err(dev, "invalid pwm-polarity %d of %pOFn\n", val, child); + return -EINVAL; + } + data->pwm_polarity[i] = val; + } + + 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, "channel")) + 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) @@ -560,6 +609,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; + } + + err = max6639_probe_from_dt(client, data); + if (err) + return err; + /* Initialize the max6639 chip */ err = max6639_init_client(client, data); if (err < 0) @@ -618,6 +685,14 @@ static const struct i2c_device_id max6639_id[] = { MODULE_DEVICE_TABLE(i2c, max6639_id); +#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 = { @@ -625,6 +700,7 @@ static struct i2c_driver max6639_driver = { .driver = { .name = "max6639", .pm = &max6639_pm_ops, + .of_match_table = of_match_ptr(maxim_of_platform_match), }, .probe_new = max6639_probe, .id_table = max6639_id, diff --git a/include/linux/platform_data/max6639.h b/include/linux/platform_data/max6639.h deleted file mode 100644 index 65bfdb4fdc15..000000000000 --- a/include/linux/platform_data/max6639.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_MAX6639_H -#define _LINUX_MAX6639_H - -#include - -/* platform data for the MAX6639 temperature sensor and fan control */ - -struct max6639_platform_data { - bool pwm_polarity; /* Polarity low (0) or high (1, default) */ - int ppr; /* Pulses per rotation 1..4 (default == 2) */ - int rpm_range; /* 2000, 4000 (default), 8000 or 16000 */ -}; - -#endif /* _LINUX_MAX6639_H */