From patchwork Tue Nov 29 16:11:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 629259 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 AC213C4708D for ; Tue, 29 Nov 2022 16:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234942AbiK2QLv (ORCPT ); Tue, 29 Nov 2022 11:11:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234997AbiK2QLr (ORCPT ); Tue, 29 Nov 2022 11:11:47 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2ECC58BDB for ; Tue, 29 Nov 2022 08:11:44 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id y16so3125474wrm.2 for ; Tue, 29 Nov 2022 08:11:44 -0800 (PST) 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=YvL3HW2HV2h6S+uZhbUuMx81NAIv7YRIQVk1rbQCvyQ=; b=W6dtGbUu2vRdZDspY4ddA1UdZcHbBBBXalQ1fdO9Unj9KFwUganl5wtfc7CsT0+utQ AUD9c29NI/qK0jFNawQL5zYwAZZUcAbrDtLyBqpHf06HIi0brzjWdMZqpskp/hOzCvVc A+SxDiycyQaFzf3I+5YO88+1+M1H09xyONLCzXOFJW2SsZkPZgIkdzNqDrkHkBH1NrNh AhTEl243+96pXqBx3RTWV+WwpZILEFsnUAc3nuify6LYpv7zDuhUuzua+c9bgVGqN0wC UObVzQSfb2NOsvx+yZ9aly9eqnf0APdt7GO30u9PwCGnAJIw0vQyXQQP49KvIlnHBvAp Irdg== 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=YvL3HW2HV2h6S+uZhbUuMx81NAIv7YRIQVk1rbQCvyQ=; b=carNVm/lN/ytwASbbrPJNog69gYio5VB1fFpNDYpAU2e8UNyFyfupb/OKnq1We3oRt Czs2vVUdiAVmIaf91oc4I3gcW8rvLKmEH3D7aFRKder9GUqqtiZLFzObvN21OsNa7Oq4 hLfPsMTIgKX69BRpEhBOvqXU1fOZ8eR10UOWPV06gpxdI/LZoCCc0F8bBnxnUk+ln2Ra zF1jCVdxw304UaKbfpaGJtK1q7rUR/BZLCRdhS8xQLbk5Ho5BjPo+Ox/ywvvSLkFIwvj 79TbAe3argqjPT5713IL1HQG3ST0niPi1hjSxh6tLSgSiRInd8KkVgtHkUqpah2Iv8Ux edTA== X-Gm-Message-State: ANoB5pkLDh/hFBqwoPK4zH9fYLvMD3aT0yuH0EliToYM05ohJagePvv/ m1SwuD81UkL5oINOy9MLHU26N36fzI75ebCn X-Google-Smtp-Source: AA0mqf58kiqlZ2V3oQAlTs/4txmkzemDP8pr3C+VoaiFcsx7pa3hYYt7gYLmMo8SeRAU6RUSRxcxJg== X-Received: by 2002:a5d:55c3:0:b0:236:c12b:6e29 with SMTP id i3-20020a5d55c3000000b00236c12b6e29mr34693883wrw.98.1669738303344; Tue, 29 Nov 2022 08:11:43 -0800 (PST) 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 n26-20020a05600c3b9a00b003c6b70a4d69sm3144522wms.42.2022.11.29.08.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 08:11:43 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Rob Herring , Krzysztof Kozlowski , Roland Stigge Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Marcello Sylvester Bauer , Naresh Solanki Subject: [PATCH v8 2/4] dt-bindings: hwmon: Add max6639 Date: Tue, 29 Nov 2022 17:11:32 +0100 Message-Id: <20221129161134.2672474-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221129161134.2672474-1-Naresh.Solanki@9elements.com> References: <20221129161134.2672474-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Marcello Sylvester Bauer Add Devicetree binding documentation for Maxim MAX6639 temperature monitor with PWM fan-speed controller. Signed-off-by: Marcello Sylvester Bauer Signed-off-by: Naresh Solanki --- .../bindings/hwmon/maxim,max6639.yaml | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml diff --git a/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml b/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml new file mode 100644 index 000000000000..78a09ce35986 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml @@ -0,0 +1,92 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- + +$id: http://devicetree.org/schemas/hwmon/maxim,max6639.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim max6639 + +maintainers: + - Roland Stigge + +description: | + The MAX6639 is a 2-channel temperature monitor with dual, automatic, PWM + fan-speed controller. It monitors its own temperature and one external + diode-connected transistor or the temperatures of two external diode-connected + transistors, typically available in CPUs, FPGAs, or GPUs. + + Datasheets: + https://datasheets.maximintegrated.com/en/ds/MAX6639-MAX6639F.pdf + +properties: + compatible: + enum: + - maxim,max6639 + + reg: + maxItems: 1 + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + '#pwm-cells': + const: 3 + +required: + - compatible + - reg + +patternProperties: + "^fan@[0-1]$": + type: object + description: | + Represents the two fans and their specific configuration. + + $ref: fan-common.yaml# + + unevaluatedProperties: false + + properties: + reg: + description: | + The fan number. + + required: + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + fan1: fan-controller@10 { + compatible = "maxim,max6639"; + reg = <0x10>; + #address-cells = <1>; + #size-cells = <0>; + #pwm-cells = <3>; + + fan@0 { + reg = <0x0>; + pulses-per-revolution = <2>; + max-rpm = <4000>; + target-rpm = <1000>; + pwms = <&fan1 0 25000 0>; + }; + + fan@1 { + reg = <0x1>; + pulses-per-revolution = <2>; + max-rpm = <8000>; + pwms = <&fan1 1 25000 0>; + }; + }; + }; +... From patchwork Tue Nov 29 16:11:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 629258 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 63FC2C47088 for ; Tue, 29 Nov 2022 16:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234987AbiK2QLx (ORCPT ); Tue, 29 Nov 2022 11:11:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235301AbiK2QLt (ORCPT ); Tue, 29 Nov 2022 11:11:49 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 505AC59FD3 for ; Tue, 29 Nov 2022 08:11:47 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id o5so13877388wrm.1 for ; Tue, 29 Nov 2022 08:11:47 -0800 (PST) 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=7XHqJCL0YK4FWR7GzNLRu43PKAghRuEUD3cVbOeK4pc=; b=G1ulTJ7wmHFUAtNopaArrimu8+9gMcFZmLmG608Ew2qPwxeismvzMnCz1iScxGxGh8 mSvMMabT+KyIGA8ynlBwzIgayHbodGMrpO6QKNoOU+/BYi0vPZy0DO49jrFSBOSNOZAb o6srRoJiKmbtMKLZBrOEMKAZ3sEq158ATr1cgsdZMs/cZ18lwiCzriu/Sms3LnN7mCVu AX3spXVw4a+LWCFTlWDnx6DiV9RtQXFvNVbvJCzDFIMi+NiFQDQJ12FOZiFikoh2jUj6 zgVJBYhMLTXOVlIuvrgdBJDZeBGAh9+G+AvLciJIMfZLoUVYntljkK2FGmxVdr7E8KnG xqaA== 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=7XHqJCL0YK4FWR7GzNLRu43PKAghRuEUD3cVbOeK4pc=; b=ez/jzHSqG0IniXz+pinynmFP3NiXt7wPEyhdizbqrbfptmHe04DmSYojA8PHFrvuay GUUhZqk36Fvw4Fx0odd05jXvpM/G1iHJMkp1iGOS8TxX5KqR5v9jok8AvKm7AtfhaFTX SaSiQVnLc5H9pouwT+5ZIp2FmbjZLfFh/IBF+jTp17XiEveXSfOQuCHCUEvDUkL9izPl fllwfBLK0Rmx2neI+i4viARp2toGCfknD8UA5mQYu+By6fTyf9/hLVwvzB1IjTjSU909 +zyTSC9BnMzNsdzEZcBDRAuGakMZADA5jnJJX4NFQDC/DZD3Zfs4fs5rpl/6Ccm7m8Iw eWaA== X-Gm-Message-State: ANoB5plNB09CK8bDexttzo661i7PUgNje4OnzD3EUMKaPEDvlEhPAtjb MK8jBvKrVjVsLwj/bo3pCQaEjt4pnmmqSuML X-Google-Smtp-Source: AA0mqf6pdFfstKJyCAQ+qo2FaE+Oe7pKTfzd5xV3uB77OxzJDzvCKK6xDxHPqab+QlA2Ia026Y5tNw== X-Received: by 2002:adf:e7cd:0:b0:236:960f:161d with SMTP id e13-20020adfe7cd000000b00236960f161dmr28379737wrn.376.1669738305611; Tue, 29 Nov 2022 08:11:45 -0800 (PST) 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 n26-20020a05600c3b9a00b003c6b70a4d69sm3144522wms.42.2022.11.29.08.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 08:11:45 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki , linux-pwm@vger.kernel.org Subject: [PATCH v8 4/4] hwmon: (max6639) Add pwm support Date: Tue, 29 Nov 2022 17:11:34 +0100 Message-Id: <20221129161134.2672474-5-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221129161134.2672474-1-Naresh.Solanki@9elements.com> References: <20221129161134.2672474-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add pwm support for max6639. Also configure pwm fan speed based on pwm provided in DT. Signed-off-by: Naresh Solanki --- drivers/hwmon/Kconfig | 1 + drivers/hwmon/max6639.c | 243 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 230 insertions(+), 14 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 3176c33af6c6..56d9004b7a38 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1115,6 +1115,7 @@ config SENSORS_MAX6621 config SENSORS_MAX6639 tristate "Maxim MAX6639 sensor chip" depends on I2C + depends on PWM 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 e09358713bef..302186532e0f 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -19,6 +19,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END }; @@ -53,11 +54,17 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END }; #define MAX6639_GCONFIG_PWM_FREQ_HI 0x08 #define MAX6639_FAN_CONFIG1_PWM 0x80 - +#define MAX6639_REG_FAN_CONFIG2a_PWM_POL 0x02 #define MAX6639_FAN_CONFIG3_THERM_FULL_SPEED 0x40 +#define MAX6639_FAN_CONFIG3_FREQ_MASK 0x03 +#define MAX6639_REG_TARGTDUTY_SLOT 120 static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 }; +/* Supported PWM frequency */ +static const unsigned int freq_table[] = { 20, 33, 50, 100, 5000, 8333, 12500, + 25000 }; + #define FAN_FROM_REG(val, rpm_range) ((val) == 0 || (val) == 255 ? \ 0 : (rpm_ranges[rpm_range] * 30) / (val)) #define TEMP_LIMIT_TO_REG(val) clamp_val((val) / 1000, 0, 255) @@ -75,6 +82,9 @@ struct max6639_data { 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 >=30 */ + struct pwm_device *pwmd[2]; /* max6639 has two pwm device */ + u32 target_rpm[2]; + u32 max_rpm[2]; u8 status; /* Detected channel alarms and fan failures */ /* Register values only written to */ @@ -89,6 +99,8 @@ struct max6639_data { /* Optional regulator for FAN supply */ struct regulator *reg; + /* max6639 pwm chip */ + struct pwm_chip chip; }; static struct max6639_data *max6639_update_device(struct device *dev) @@ -279,8 +291,11 @@ static ssize_t pwm_show(struct device *dev, struct device_attribute *dev_attr, { struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct max6639_data *data = dev_get_drvdata(dev); + struct pwm_state state; + + pwm_get_state(data->pwmd[attr->index], &state); - return sprintf(buf, "%d\n", data->pwm[attr->index] * 255 / 120); + return sprintf(buf, "%d\n", pwm_get_relative_duty_cycle(&state, 255)); } static ssize_t pwm_store(struct device *dev, @@ -289,9 +304,9 @@ static ssize_t pwm_store(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct max6639_data *data = dev_get_drvdata(dev); - struct i2c_client *client = data->client; unsigned long val; int res; + struct pwm_state state; res = kstrtoul(buf, 10, &val); if (res) @@ -299,12 +314,12 @@ static ssize_t pwm_store(struct device *dev, val = clamp_val(val, 0, 255); - mutex_lock(&data->update_lock); - data->pwm[attr->index] = (u8)(val * 120 / 255); - i2c_smbus_write_byte_data(client, - MAX6639_REG_TARGTDUTY(attr->index), - data->pwm[attr->index]); - mutex_unlock(&data->update_lock); + pwm_get_state(data->pwmd[attr->index], &state); + pwm_set_relative_duty_cycle(&state, val, 255); + res = pwm_apply_state(data->pwmd[attr->index], &state); + if (res) + return res; + return count; } @@ -404,6 +419,7 @@ static int max6639_init_client(struct i2c_client *client, struct max6639_data *data) { int i, err; + struct pwm_state state; /* Reset chip to default values, see below for GCONFIG setup */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, @@ -457,10 +473,11 @@ 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]); + /* Configure PWM controller */ + pwm_get_state(data->pwmd[i], &state); + pwm_set_relative_duty_cycle(&state, data->target_rpm[i], + data->max_rpm[i]); + err = pwm_apply_state(data->pwmd[i], &state); if (err) goto exit; } @@ -539,8 +556,31 @@ static int max6639_probe_child_from_dt(struct i2c_client *client, } data->rpm_range[i] = rpm_range_to_reg(maxrpm); + data->max_rpm[i] = maxrpm; - return 0; + err = of_property_read_u32(child, "target-rpm", &val); + /* Use provided target RPM else default to maxrpm */ + if (!err) + data->target_rpm[i] = val; + else + data->target_rpm[i] = maxrpm; + + /* Get pwms property for PWM control */ + data->pwmd[i] = devm_fwnode_pwm_get(dev, &child->fwnode, NULL); + + if (!IS_ERR(data->pwmd[i])) + return 0; + + if (PTR_ERR(data->pwmd[i]) == -EPROBE_DEFER) + return PTR_ERR(data->pwmd[i]); + + dev_dbg(dev, "Using chip default PWM"); + data->pwmd[i] = pwm_request_from_chip(&data->chip, i, NULL); + if (!IS_ERR(data->pwmd[i])) + return 0; + + dev_dbg(dev, "Failed to configure pwm for fan %d", i); + return PTR_ERR_OR_ZERO(data->pwmd[i]); } static int max6639_probe_from_dt(struct i2c_client *client, struct max6639_data *data) @@ -568,6 +608,172 @@ static int max6639_probe_from_dt(struct i2c_client *client, return 0; } +static struct max6639_data *to_max6639_pwm(struct pwm_chip *chip) +{ + return container_of(chip, struct max6639_data, chip); +} + +static void max6639_pwm_get_state(struct pwm_chip *chip, + struct pwm_device *pwm, + struct pwm_state *state) +{ + + struct max6639_data *data = to_max6639_pwm(chip); + struct i2c_client *client = data->client; + int value, i = pwm->hwpwm, x; + unsigned int freq; + + mutex_lock(&data->update_lock); + + value = i2c_smbus_read_byte_data(client, MAX6639_REG_FAN_CONFIG1(i)); + if (value < 0) + goto abort; + + if (value & MAX6639_FAN_CONFIG1_PWM) { + state->enabled = true; + + /* Determine frequency from respective registers */ + value = i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i)); + if (value < 0) + goto abort; + x = value & MAX6639_FAN_CONFIG3_FREQ_MASK; + + value = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); + if (value < 0) + goto abort; + if (value & MAX6639_GCONFIG_PWM_FREQ_HI) + x |= 0x4; + x &= 0x7; + freq = freq_table[x]; + + state->period = DIV_ROUND_UP(NSEC_PER_SEC, freq); + + value = i2c_smbus_read_byte_data(client, + MAX6639_REG_TARGTDUTY(i)); + if (value < 0) + goto abort; + /* max6639 supports 120 slots only */ + state->duty_cycle = mul_u64_u32_div(state->period, value, 120); + + value = i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i)); + if (value < 0) + goto abort; + value &= MAX6639_REG_FAN_CONFIG2a_PWM_POL; + state->polarity = (value != 0); + } else + state->enabled = false; + +abort: + mutex_unlock(&data->update_lock); + +} + +static int max6639_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct max6639_data *data = to_max6639_pwm(chip); + struct i2c_client *client = data->client; + int value = 0, i = pwm->hwpwm, x; + unsigned int freq; + struct pwm_state cstate; + + cstate = pwm->state; + + mutex_lock(&data->update_lock); + + if (state->period != cstate.period) { + /* Configure frequency */ + freq = DIV_ROUND_UP_ULL(NSEC_PER_SEC, state->period); + /* Chip supports limited number of frequency */ + for (x = 0; x < sizeof(freq_table); x++) + if (freq <= freq_table[x]) + break; + + value = i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i)); + if (value < 0) + goto abort; + value &= ~MAX6639_FAN_CONFIG3_FREQ_MASK; + value |= (x & MAX6639_FAN_CONFIG3_FREQ_MASK); + value = i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i), + value); + + value = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); + if (value < 0) + goto abort; + + if (x >> 2) + value &= ~MAX6639_GCONFIG_PWM_FREQ_HI; + else + value |= MAX6639_GCONFIG_PWM_FREQ_HI; + value = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, + value); + if (value < 0) + goto abort; + } + + /* Configure dutycycle */ + if (state->duty_cycle != cstate.duty_cycle || + state->period != cstate.period) { + value = DIV_ROUND_DOWN_ULL( + state->duty_cycle * MAX6639_REG_TARGTDUTY_SLOT, + state->period); + value = i2c_smbus_write_byte_data(client, + MAX6639_REG_TARGTDUTY(i), + value); + if (value < 0) + goto abort; + } + + /* Configure polarity */ + if (state->polarity != cstate.polarity) { + value = i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i)); + if (value < 0) + goto abort; + if (state->polarity == PWM_POLARITY_NORMAL) + value |= MAX6639_REG_FAN_CONFIG2a_PWM_POL; + else + value &= ~MAX6639_REG_FAN_CONFIG2a_PWM_POL; + value = i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i), + value); + if (value < 0) + goto abort; + } + + if (state->enabled == cstate.enabled) + goto abort; + + value = i2c_smbus_read_byte_data(client, MAX6639_REG_FAN_CONFIG1(i)); + if (value < 0) + goto abort; + if (state->enabled) + value |= MAX6639_FAN_CONFIG1_PWM; + else + value &= ~MAX6639_FAN_CONFIG1_PWM; + + value = i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_CONFIG1(i), + value); + if (value < 0) + goto abort; + value = 0; + +abort: + mutex_unlock(&data->update_lock); + + return value; +} + +static const struct pwm_ops max6639_pwm_ops = { + .apply = max6639_pwm_apply, + .get_state = max6639_pwm_get_state, + .owner = THIS_MODULE, +}; + static int max6639_probe(struct i2c_client *client) { struct device *dev = &client->dev; @@ -581,6 +787,15 @@ static int max6639_probe(struct i2c_client *client) data->client = client; + /* Add PWM controller of max6639 */ + data->chip.dev = dev; + data->chip.ops = &max6639_pwm_ops; + data->chip.npwm = 2; + + err = devm_pwmchip_add(dev, &data->chip); + if (err < 0) + return dev_err_probe(dev, err, "failed to add PWM chip\n"); + data->reg = devm_regulator_get_optional(dev, "fan"); if (IS_ERR(data->reg)) { if (PTR_ERR(data->reg) != -ENODEV)