From nobody Thu Dec 18 07:11:51 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 346711A0AF9 for ; Tue, 30 Apr 2024 21:05:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714511146; cv=none; b=rZTOcnBVSATsZhl8HN9DrjUFstEGcyGt96qUBOay1ipyy4M0/efUJIX4lM2CjIrMzFle2hNBMGE0ieHYfv/lAZfUvix0v4xlKRBwmnvDQmS4D5dMHXAalv0Aq2ukZVOeqgk3Op/jEGWtjbyH66OH/jYuweWDY1cHmNb5oPvaNic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714511146; c=relaxed/simple; bh=KLcb0NDwuIx241UKNfejyZb12C0ZDY+GzOzoqmfyoPk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LZdIA263uU4eeix5IfmlbMPOoJO+vthX9cjhKrD/wS0AvXuZ5LwQYH+h+ab+Vc8OsKxD9ZiXLukWYEzrrbm0QD1pSHcle7/IcP3SUm4ElAHWU7Oj3qZU5RfffSxPct7Ff+bQt4AL1svoB2FtWkdSpnAao5yu+UkCnVCRhahfhY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=KDhP+Mf5; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="KDhP+Mf5" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-41b869326daso33529675e9.0 for ; Tue, 30 Apr 2024 14:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1714511141; x=1715115941; 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=vdXbVOf7X2hgQ5AxJONB1g2nuUIOvffE/hB/3N0SbRs=; b=KDhP+Mf5/0RBIlwwo1EnMXMi8RbGyvf9SwgHfW3XosfaSf1eHbfYZZ5GVhwuLZ/a2w mOqFu1uMmrBNNTvF0kELW7eDkdLxAQrlOIB+qFLERsZmkXzyHsydvwtrnzqJNDaW6TLS 0vdlx0tSM0/qjJhH6ThEHd8LvMF8RIJoFhP1aOVsfiYU+wLfVefT8wHEnl0Fss0EB3P0 jIqP9Vi0E4CQ+EVKBtorfZUYFPwACO3gW30buEQ30ipb1QjZBOGlRWnmp7yjifupkGY+ qvRmeu2IY3H0KU0yG1/LFuufoP42pxQ/0kdBc4WcOQ9PV7cVeEtBFjRvJtwME2iguS8t BnHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714511141; x=1715115941; 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=vdXbVOf7X2hgQ5AxJONB1g2nuUIOvffE/hB/3N0SbRs=; b=BAPMSV+0YQuBbHZtuYGN16QY7v/ZlQu7ukuVjqt4KF/+6D+0ED43jfdmA3eZiNO+QV Zme8whjmf54MczYCMXGML9kN4Emu8vwXlysb8oTQPEblPQNZIHX2Io/xcI4b1J2ONxku wFkABWW35x/ArSR7KidCpv6llx82yfXLvrElPTO4ZBprP7ovvTvBYx7wIstTK+cHPSkv A4UCL1yLwiowMXXuvWSWffy3VVMx1PpOJDYu0bmarXNassmr8xnn59NEU3aUryWsQLNk UzkolknN2v+NbNwBRfzpnn+3lFgViXsUDLKJAYjzzK2yzIXImI72RmCjH44TbzhYPdCu qSiA== X-Forwarded-Encrypted: i=1; AJvYcCWVVgBp6grfq5hz8IyCHdM+EqcecsWdHmh1bKjDcRkAtSavqsw1EIk4MKiw0SXW2nJllxRf5e8PvfXMdV8VjA7tAXK8ClvM1ziOa47E X-Gm-Message-State: AOJu0YyJeRV+/5L9NFDTdIjPxi5aTn9GFJ0FXaBLMEppM0xDxcK3mrkJ 3sfJdS6213J7R+WKpq82/6cpWx8x9RemRJPaYqQJfF27nLxEFnKQyx3rYnQ2mHk= X-Google-Smtp-Source: AGHT+IEmR4uYBboXVv9j6jJnXPP9YKylOEdqyV2/vqOBpI0oot6By4mXO24LxCT8SOdqmvV5RYZG1g== X-Received: by 2002:adf:dd8f:0:b0:349:bccc:a1e7 with SMTP id x15-20020adfdd8f000000b00349bccca1e7mr613478wrl.19.1714511141371; Tue, 30 Apr 2024 14:05:41 -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 z7-20020a5d6547000000b0034c9fa2c964sm9547471wrv.23.2024.04.30.14.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 14:05:40 -0700 (PDT) From: Naresh Solanki To: Jean Delvare , Guenter Roeck Cc: Naresh Solanki , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] hwmon (max6639): Use regmap Date: Wed, 1 May 2024 02:35:38 +0530 Message-ID: <20240430210539.935040-1-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add regmap support & remove local caching. Signed-off-by: Naresh Solanki --- drivers/hwmon/Kconfig | 1 + drivers/hwmon/max6639.c | 310 ++++++++++++++++++++-------------------- 2 files changed, 154 insertions(+), 157 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index bafc0058c728..e14ae18a973b 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1233,6 +1233,7 @@ config SENSORS_MAX6621 config SENSORS_MAX6639 tristate "Maxim MAX6639 sensor chip" depends on I2C + select REGMAP_I2C help If you say yes here you get support for the MAX6639 sensor chips. diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 5dd0349e8bd0..b12d2098e259 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 /* Addresses to scan */ static const unsigned short normal_i2c[] =3D { 0x2c, 0x2e, 0x2f, I2C_CLIEN= T_END }; @@ -57,6 +58,8 @@ static const unsigned short normal_i2c[] =3D { 0x2c, 0x2e= , 0x2f, I2C_CLIENT_END }; =20 #define MAX6639_FAN_CONFIG3_THERM_FULL_SPEED 0x40 =20 +#define MAX6639_NDEV 2 + static const int rpm_ranges[] =3D { 2000, 4000, 8000, 16000 }; =20 #define FAN_FROM_REG(val, rpm_range) ((val) =3D=3D 0 || (val) =3D=3D 255 ?= \ @@ -67,22 +70,11 @@ static const int rpm_ranges[] =3D { 2000, 4000, 8000, 1= 6000 }; * Client data (each client gets its own) */ struct max6639_data { - struct i2c_client *client; + struct regmap *regmap; struct mutex update_lock; - bool valid; /* true if following fields are valid */ - unsigned long last_updated; /* In jiffies */ - - /* Register values sampled regularly */ - u16 temp[2]; /* Temperature, in 1/8 C, 0..255 C */ - bool temp_fault[2]; /* Detected temperature diode failure */ - u8 fan[2]; /* Register value: TACH count for fans >=3D30 */ - u8 status; /* Detected channel alarms and fan failures */ =20 /* Register values only written to */ - u8 pwm[2]; /* Register value: Duty cycle 0..120 */ - u8 temp_therm[2]; /* THERM Temperature, 0..255 C (->_max) */ - u8 temp_alert[2]; /* ALERT Temperature, 0..255 C (->_crit) */ - u8 temp_ot[2]; /* OT Temperature, 0..255 C (->_emergency) */ + u8 pwm[MAX6639_NDEV]; /* Register value: Duty cycle 0..120 */ =20 /* Register values initialized only once */ u8 ppr; /* Pulses per rotation 0..3 for 1..4 ppr */ @@ -92,90 +84,58 @@ struct max6639_data { struct regulator *reg; }; =20 -static struct max6639_data *max6639_update_device(struct device *dev) -{ - struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; - struct max6639_data *ret =3D data; - int i; - int status_reg; - - mutex_lock(&data->update_lock); - - if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { - int res; - - dev_dbg(&client->dev, "Starting max6639 update\n"); - - status_reg =3D i2c_smbus_read_byte_data(client, - MAX6639_REG_STATUS); - if (status_reg < 0) { - ret =3D ERR_PTR(status_reg); - goto abort; - } - - data->status =3D status_reg; - - for (i =3D 0; i < 2; i++) { - res =3D i2c_smbus_read_byte_data(client, - MAX6639_REG_FAN_CNT(i)); - if (res < 0) { - ret =3D ERR_PTR(res); - goto abort; - } - data->fan[i] =3D res; - - res =3D i2c_smbus_read_byte_data(client, - MAX6639_REG_TEMP_EXT(i)); - if (res < 0) { - ret =3D ERR_PTR(res); - goto abort; - } - data->temp[i] =3D res >> 5; - data->temp_fault[i] =3D res & 0x01; - - res =3D i2c_smbus_read_byte_data(client, - MAX6639_REG_TEMP(i)); - if (res < 0) { - ret =3D ERR_PTR(res); - goto abort; - } - data->temp[i] |=3D res << 3; - } - - data->last_updated =3D jiffies; - data->valid =3D true; - } -abort: - mutex_unlock(&data->update_lock); - - return ret; -} - static ssize_t temp_input_show(struct device *dev, struct device_attribute *dev_attr, char *buf) { long temp; - struct max6639_data *data =3D max6639_update_device(dev); + struct max6639_data *data =3D dev_get_drvdata(dev); struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); + unsigned int val; + int res; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 - temp =3D data->temp[attr->index] * 125; + mutex_lock(&data->update_lock); + res =3D regmap_read(data->regmap, MAX6639_REG_TEMP_EXT(attr->index), &val= ); + if (res < 0) + goto exit; + + temp =3D val >> 5; + res =3D regmap_read(data->regmap, MAX6639_REG_TEMP(attr->index), &val); + if (res < 0) + goto exit; + + temp |=3D val << 3; + temp *=3D 125; + +exit: + mutex_unlock(&data->update_lock); + if (res < 0) + return res; + return sprintf(buf, "%ld\n", temp); } =20 static ssize_t temp_fault_show(struct device *dev, struct device_attribute *dev_attr, char *buf) { - struct max6639_data *data =3D max6639_update_device(dev); + struct max6639_data *data =3D dev_get_drvdata(dev); struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); + unsigned int val; + int res; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 - return sprintf(buf, "%d\n", data->temp_fault[attr->index]); + mutex_lock(&data->update_lock); + res =3D regmap_read(data->regmap, MAX6639_REG_TEMP_EXT(attr->index), &val= ); + mutex_unlock(&data->update_lock); + + if (res < 0) + return res; + + return sprintf(buf, "%d\n", val & 1); } =20 static ssize_t temp_max_show(struct device *dev, @@ -183,8 +143,17 @@ static ssize_t temp_max_show(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); + unsigned int val; + int res; =20 - return sprintf(buf, "%d\n", (data->temp_therm[attr->index] * 1000)); + mutex_lock(&data->update_lock); + res =3D regmap_read(data->regmap, MAX6639_REG_THERM_LIMIT(attr->index), &= val); + mutex_unlock(&data->update_lock); + + if (res < 0) + return res; + + return sprintf(buf, "%d\n", (val * 1000)); } =20 static ssize_t temp_max_store(struct device *dev, @@ -193,7 +162,6 @@ static ssize_t temp_max_store(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; unsigned long val; int res; =20 @@ -202,10 +170,8 @@ static ssize_t temp_max_store(struct device *dev, return res; =20 mutex_lock(&data->update_lock); - data->temp_therm[attr->index] =3D TEMP_LIMIT_TO_REG(val); - i2c_smbus_write_byte_data(client, - MAX6639_REG_THERM_LIMIT(attr->index), - data->temp_therm[attr->index]); + regmap_write(data->regmap, MAX6639_REG_THERM_LIMIT(attr->index), + TEMP_LIMIT_TO_REG(val)); mutex_unlock(&data->update_lock); return count; } @@ -215,8 +181,17 @@ static ssize_t temp_crit_show(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); + unsigned int val; + int res; + + mutex_lock(&data->update_lock); + res =3D regmap_read(data->regmap, MAX6639_REG_ALERT_LIMIT(attr->index), &= val); + mutex_unlock(&data->update_lock); =20 - return sprintf(buf, "%d\n", (data->temp_alert[attr->index] * 1000)); + if (res < 0) + return res; + + return sprintf(buf, "%d\n", (val * 1000)); } =20 static ssize_t temp_crit_store(struct device *dev, @@ -225,7 +200,6 @@ static ssize_t temp_crit_store(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; unsigned long val; int res; =20 @@ -234,10 +208,8 @@ static ssize_t temp_crit_store(struct device *dev, return res; =20 mutex_lock(&data->update_lock); - data->temp_alert[attr->index] =3D TEMP_LIMIT_TO_REG(val); - i2c_smbus_write_byte_data(client, - MAX6639_REG_ALERT_LIMIT(attr->index), - data->temp_alert[attr->index]); + regmap_write(data->regmap, MAX6639_REG_ALERT_LIMIT(attr->index), + TEMP_LIMIT_TO_REG(val)); mutex_unlock(&data->update_lock); return count; } @@ -248,8 +220,17 @@ static ssize_t temp_emergency_show(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); + unsigned int val; + int res; =20 - return sprintf(buf, "%d\n", (data->temp_ot[attr->index] * 1000)); + mutex_lock(&data->update_lock); + res =3D regmap_read(data->regmap, MAX6639_REG_OT_LIMIT(attr->index), &val= ); + mutex_unlock(&data->update_lock); + + if (res < 0) + return res; + + return sprintf(buf, "%d\n", (val * 1000)); } =20 static ssize_t temp_emergency_store(struct device *dev, @@ -258,7 +239,6 @@ static ssize_t temp_emergency_store(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; unsigned long val; int res; =20 @@ -267,10 +247,7 @@ static ssize_t temp_emergency_store(struct device *dev, return res; =20 mutex_lock(&data->update_lock); - data->temp_ot[attr->index] =3D TEMP_LIMIT_TO_REG(val); - i2c_smbus_write_byte_data(client, - MAX6639_REG_OT_LIMIT(attr->index), - data->temp_ot[attr->index]); + regmap_write(data->regmap, MAX6639_REG_OT_LIMIT(attr->index), TEMP_LIMIT_= TO_REG(val)); mutex_unlock(&data->update_lock); return count; } @@ -290,7 +267,6 @@ static ssize_t pwm_store(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; unsigned long val; int res; =20 @@ -299,12 +275,9 @@ static ssize_t pwm_store(struct device *dev, return res; =20 val =3D clamp_val(val, 0, 255); - - mutex_lock(&data->update_lock); data->pwm[attr->index] =3D (u8)(val * 120 / 255); - i2c_smbus_write_byte_data(client, - MAX6639_REG_TARGTDUTY(attr->index), - data->pwm[attr->index]); + mutex_lock(&data->update_lock); + regmap_write(data->regmap, MAX6639_REG_TARGTDUTY(attr->index), data->pwm[= attr->index]); mutex_unlock(&data->update_lock); return count; } @@ -312,26 +285,35 @@ static ssize_t pwm_store(struct device *dev, static ssize_t fan_input_show(struct device *dev, struct device_attribute *dev_attr, char *buf) { - struct max6639_data *data =3D max6639_update_device(dev); + struct max6639_data *data =3D dev_get_drvdata(dev); struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); + unsigned int val; + int res; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 - return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index], - data->rpm_range)); + res =3D regmap_read(data->regmap, MAX6639_REG_FAN_CNT(attr->index), &val); + if (res < 0) + return res; + + return sprintf(buf, "%d\n", FAN_FROM_REG(val, data->rpm_range)); } =20 static ssize_t alarm_show(struct device *dev, struct device_attribute *dev_attr, char *buf) { - struct max6639_data *data =3D max6639_update_device(dev); + struct max6639_data *data =3D dev_get_drvdata(dev); struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); + unsigned int val; + int res; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 - return sprintf(buf, "%d\n", !!(data->status & (1 << attr->index))); + res =3D regmap_read(data->regmap, MAX6639_REG_STATUS, &val); + + return sprintf(buf, "%d\n", !!(val & (1 << attr->index))); } =20 static SENSOR_DEVICE_ATTR_RO(temp1_input, temp_input, 0); @@ -401,6 +383,11 @@ static int rpm_range_to_reg(int range) return 1; /* default: 4000 RPM */ } =20 +static int max6639_set_ppr(struct max6639_data *data, u8 channel, u8 ppr) +{ + return regmap_write(data->regmap, MAX6639_REG_FAN_PPR(channel), ppr << 6); +} + static int max6639_init_client(struct i2c_client *client, struct max6639_data *data) { @@ -408,49 +395,43 @@ static int max6639_init_client(struct i2c_client *cli= ent, dev_get_platdata(&client->dev); int i; int rpm_range =3D 1; /* default: 4000 RPM */ - int err; + int err, ppr; =20 /* Reset chip to default values, see below for GCONFIG setup */ - err =3D i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, - MAX6639_GCONFIG_POR); + err =3D regmap_write(data->regmap, MAX6639_REG_GCONFIG, MAX6639_GCONFIG_P= OR); if (err) goto exit; =20 /* Fans pulse per revolution is 2 by default */ if (max6639_info && max6639_info->ppr > 0 && max6639_info->ppr < 5) - data->ppr =3D max6639_info->ppr; + ppr =3D max6639_info->ppr; else - data->ppr =3D 2; - data->ppr -=3D 1; + ppr =3D 2; + ppr -=3D 1; =20 if (max6639_info) rpm_range =3D rpm_range_to_reg(max6639_info->rpm_range); data->rpm_range =3D rpm_range; =20 - for (i =3D 0; i < 2; i++) { + for (i =3D 0; i < MAX6639_NDEV; i++) { =20 /* Set Fan pulse per revolution */ - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_PPR(i), - data->ppr << 6); + err =3D max6639_set_ppr(data, i, ppr); if (err) goto exit; =20 /* Fans config PWM, RPM */ - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG1(i), - MAX6639_FAN_CONFIG1_PWM | rpm_range); + err =3D regmap_write(data->regmap, MAX6639_REG_FAN_CONFIG1(i), + MAX6639_FAN_CONFIG1_PWM | rpm_range); if (err) goto exit; =20 /* Fans PWM polarity high by default */ if (max6639_info && max6639_info->pwm_polarity =3D=3D 0) - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x00); + err =3D regmap_write(data->regmap, MAX6639_REG_FAN_CONFIG2a(i), 0x00); else - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x02); + err =3D regmap_write(data->regmap, MAX6639_REG_FAN_CONFIG2a(i), 0x02); if (err) goto exit; =20 @@ -458,42 +439,31 @@ static int max6639_init_client(struct i2c_client *cli= ent, * /THERM full speed enable, * PWM frequency 25kHz, see also GCONFIG below */ - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG3(i), - MAX6639_FAN_CONFIG3_THERM_FULL_SPEED | 0x03); + err =3D regmap_write(data->regmap, MAX6639_REG_FAN_CONFIG3(i), + MAX6639_FAN_CONFIG3_THERM_FULL_SPEED | 0x03); if (err) goto exit; =20 /* Max. temp. 80C/90C/100C */ - data->temp_therm[i] =3D 80; - data->temp_alert[i] =3D 90; - data->temp_ot[i] =3D 100; - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_THERM_LIMIT(i), - data->temp_therm[i]); + err =3D regmap_write(data->regmap, MAX6639_REG_THERM_LIMIT(i), 80); if (err) goto exit; - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_ALERT_LIMIT(i), - data->temp_alert[i]); + err =3D regmap_write(data->regmap, MAX6639_REG_ALERT_LIMIT(i), 90); if (err) goto exit; - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_OT_LIMIT(i), data->temp_ot[i]); + err =3D regmap_write(data->regmap, MAX6639_REG_OT_LIMIT(i), 100); if (err) goto exit; =20 /* PWM 120/120 (i.e. 100%) */ - data->pwm[i] =3D 120; - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_TARGTDUTY(i), data->pwm[i]); + err =3D regmap_write(data->regmap, MAX6639_REG_TARGTDUTY(i), 120); if (err) goto exit; } /* Start monitoring */ - err =3D i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, - MAX6639_GCONFIG_DISABLE_TIMEOUT | MAX6639_GCONFIG_CH2_LOCAL | - MAX6639_GCONFIG_PWM_FREQ_HI); + err =3D regmap_write(data->regmap, MAX6639_REG_GCONFIG, + MAX6639_GCONFIG_DISABLE_TIMEOUT | MAX6639_GCONFIG_CH2_LOCAL | + MAX6639_GCONFIG_PWM_FREQ_HI); exit: return err; } @@ -524,6 +494,30 @@ static void max6639_regulator_disable(void *data) regulator_disable(data); } =20 +static bool max6639_regmap_is_volatile(struct device *dev, unsigned int re= g) +{ + switch (reg) { + case MAX6639_REG_TEMP(0): + case MAX6639_REG_TEMP_EXT(0): + case MAX6639_REG_TEMP(1): + case MAX6639_REG_TEMP_EXT(1): + case MAX6639_REG_STATUS: + case MAX6639_REG_FAN_CNT(0): + case MAX6639_REG_FAN_CNT(1): + return true; + default: + return false; + } +} + +static const struct regmap_config max6639_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .max_register =3D MAX6639_REG_DEVREV, + .cache_type =3D REGCACHE_MAPLE, + .volatile_reg =3D max6639_regmap_is_volatile, +}; + static int max6639_probe(struct i2c_client *client) { struct device *dev =3D &client->dev; @@ -535,7 +529,11 @@ static int max6639_probe(struct i2c_client *client) if (!data) return -ENOMEM; =20 - data->client =3D client; + data->regmap =3D devm_regmap_init_i2c(client, &max6639_regmap_config); + if (IS_ERR(data->regmap)) + return dev_err_probe(dev, + PTR_ERR(data->regmap), + "regmap initialization failed\n"); =20 data->reg =3D devm_regulator_get_optional(dev, "fan"); if (IS_ERR(data->reg)) { @@ -573,25 +571,24 @@ static int max6639_probe(struct i2c_client *client) =20 static int max6639_suspend(struct device *dev) { - struct i2c_client *client =3D to_i2c_client(dev); struct max6639_data *data =3D dev_get_drvdata(dev); - int ret =3D i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); + int ret, err; =20 - if (ret < 0) - return ret; + err =3D regmap_read(data->regmap, MAX6639_REG_GCONFIG, &ret); + + if (err < 0) + return err; =20 if (data->reg) regulator_disable(data->reg); =20 - return i2c_smbus_write_byte_data(client, - MAX6639_REG_GCONFIG, ret | MAX6639_GCONFIG_STANDBY); + return regmap_write(data->regmap, MAX6639_REG_GCONFIG, ret | MAX6639_GCON= FIG_STANDBY); } =20 static int max6639_resume(struct device *dev) { - struct i2c_client *client =3D to_i2c_client(dev); struct max6639_data *data =3D dev_get_drvdata(dev); - int ret; + int ret, err; =20 if (data->reg) { ret =3D regulator_enable(data->reg); @@ -601,12 +598,11 @@ static int max6639_resume(struct device *dev) } } =20 - ret =3D i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); - if (ret < 0) - return ret; + err =3D regmap_read(data->regmap, MAX6639_REG_GCONFIG, &ret); + if (err < 0) + return err; =20 - return i2c_smbus_write_byte_data(client, - MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); + return regmap_write(data->regmap, MAX6639_REG_GCONFIG, ret & ~MAX6639_GCO= NFIG_STANDBY); } =20 static const struct i2c_device_id max6639_id[] =3D { base-commit: 8b3aa2c488653fa1e127cf6e11499a8cbbaccad0 --=20 2.42.0