From patchwork Mon Aug 1 05:41:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Scott X-Patchwork-Id: 9253749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FA746048B for ; Mon, 1 Aug 2016 05:42:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FCBD2848B for ; Mon, 1 Aug 2016 05:42:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23D862848E; Mon, 1 Aug 2016 05:42:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2ADD2848B for ; Mon, 1 Aug 2016 05:42:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750911AbcHAFmA (ORCPT ); Mon, 1 Aug 2016 01:42:00 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:51665 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbcHAFl7 (ORCPT ); Mon, 1 Aug 2016 01:41:59 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 7B9D0803EC; Mon, 1 Aug 2016 17:41:55 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail; t=1470030115; bh=vhjluzxuGBIy/eG/1WudQlEgWPjyWVzv4lgSto0wGaM=; h=From:To:Cc:Subject:Date; b=aRUkoqLg/ZRSg1BMYlyqtOSxgT9D0nEYe0m+xkcEMAHcGquc0q7+0mR8iCHx1l+z4 1M35W04MwG3dHY9EKVv2luDPihvyG8APe6C/d9/0PgVDBsvxodJi+knlyY5+bgY3mX RUgCdXrYo63LezloiFtjrK0ktNmHop3QCKyNs6xQ= Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 3, 6, 7949) id ; Mon, 01 Aug 2016 17:41:54 +1200 Received: from joshuas-dl.ws.atlnz.lc (joshuas-dl.ws.atlnz.lc [10.33.13.25]) by smtp (Postfix) with ESMTP id 6717213EC40; Mon, 1 Aug 2016 17:41:54 +1200 (NZST) Received: by joshuas-dl.ws.atlnz.lc (Postfix, from userid 1634) id CE6CB1A0692; Mon, 1 Aug 2016 17:41:54 +1200 (NZST) From: Joshua Scott To: Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org Cc: Joshua Scott , Chris Packham Subject: [PATCH] hwmon: adt7470: Expose PWM frequency to sysfs Date: Mon, 1 Aug 2016 17:41:51 +1200 Message-Id: <20160801054151.27639-1-joshua.scott@alliedtelesis.co.nz> X-Mailer: git-send-email 2.9.0 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ADT7470 supports a variety of PWM frequencies. This patch allows the frequency to be configured and viewed through the sysfs entry pwm1_freq. Signed-off-by: Joshua Scott --- Documentation/hwmon/adt7470 | 17 +++++ drivers/hwmon/adt7470.c | 149 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/Documentation/hwmon/adt7470 b/Documentation/hwmon/adt7470 index 8ce4aa0..fe68e18 100644 --- a/Documentation/hwmon/adt7470 +++ b/Documentation/hwmon/adt7470 @@ -65,6 +65,23 @@ from 0 (off) to 255 (full speed). Fan speed will be set to maximum when the temperature sensor associated with the PWM control exceeds pwm#_auto_point2_temp. +The driver also allows control of the PWM frequency: + +* pwm1_freq + +The PWM frequency is rounded to the nearest one of: + +* 11.0 Hz +* 14.7 Hz +* 22.1 Hz +* 29.4 Hz +* 35.3 Hz +* 44.1 Hz +* 58.8 Hz +* 88.2 Hz +* 1.4 kHz +* 22.5 kHz + Notes ----- diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c index f5da39a..f57026f 100644 --- a/drivers/hwmon/adt7470.c +++ b/drivers/hwmon/adt7470.c @@ -32,6 +32,7 @@ #include #include #include +#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; @@ -83,6 +84,7 @@ static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; #define ADT7470_REG_PWM_MIN_MAX_ADDR 0x6D #define ADT7470_REG_PWM_TEMP_MIN_BASE_ADDR 0x6E #define ADT7470_REG_PWM_TEMP_MIN_MAX_ADDR 0x71 +#define ADT7470_REG_CFG_2 0x74 #define ADT7470_REG_ACOUSTICS12 0x75 #define ADT7470_REG_ACOUSTICS34 0x76 #define ADT7470_REG_DEVICE 0x3D @@ -142,6 +144,22 @@ static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; #define FAN_PERIOD_INVALID 65535 #define FAN_DATA_VALID(x) ((x) && (x) != FAN_PERIOD_INVALID) +/* The datasheet includes a table of available pwm frequencies + * controlled by values in config registers 1 and 2. + */ +#define ADT7470_CFG_LF 0x40 +#define ADT7470_FREQ_BITS 0x70 +#define ADT7470_CFG_LF_11_0_HZ 0x00 +#define ADT7470_CFG_LF_14_7_HZ 0x10 +#define ADT7470_CFG_LF_22_1_HZ 0x20 +#define ADT7470_CFG_LF_29_4_HZ 0x30 +#define ADT7470_CFG_LF_35_3_HZ 0x40 +#define ADT7470_CFG_LF_44_1_HZ 0x50 +#define ADT7470_CFG_LF_58_8_HZ 0x60 +#define ADT7470_CFG_LF_88_2_HZ 0x70 +#define ADT7470_CFG_HF_1_4_KHZ 0x00 +#define ADT7470_CFG_HF_22_5_KHZ 0x10 + struct adt7470_data { struct i2c_client *client; struct mutex lock; @@ -688,6 +706,134 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, return count; } +static ssize_t show_pwm_freq(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct adt7470_data *data = adt7470_update_device(dev); + unsigned char cfg_reg_1; + unsigned char cfg_reg_2; + int freq = -EINVAL; + + mutex_lock(&data->lock); + cfg_reg_1 = i2c_smbus_read_byte_data(data->client, ADT7470_REG_CFG); + cfg_reg_2 = i2c_smbus_read_byte_data(data->client, ADT7470_REG_CFG_2); + mutex_unlock(&data->lock); + + if (cfg_reg_1 & ADT7470_CFG_LF) + switch (cfg_reg_2 & ADT7470_FREQ_BITS) { + case ADT7470_CFG_LF_11_0_HZ: + freq = 11; + break; + case ADT7470_CFG_LF_14_7_HZ: + freq = 15; + break; + case ADT7470_CFG_LF_22_1_HZ: + freq = 22; + break; + case ADT7470_CFG_LF_29_4_HZ: + freq = 29; + break; + case ADT7470_CFG_LF_35_3_HZ: + freq = 35; + break; + case ADT7470_CFG_LF_44_1_HZ: + freq = 44; + break; + case ADT7470_CFG_LF_58_8_HZ: + freq = 59; + break; + case ADT7470_CFG_LF_88_2_HZ: + freq = 88; + break; + } + else + switch (cfg_reg_2 & ADT7470_FREQ_BITS) { + case ADT7470_CFG_HF_1_4_KHZ: + freq = 1400; + break; + default: + freq = 22500; + break; + } + return scnprintf(buf, PAGE_SIZE, "%d\n", freq); +} + +/* These are the valid PWM frequencies to the nearest Hz */ +static const int adt7470_freq_map[] = { + 11, 15, 22, 29, 35, 44, 59, 88, 1400, 22500 +}; + +static ssize_t set_pwm_freq(struct device *dev, + struct device_attribute *devattr, + const char *buf, size_t count) +{ + struct adt7470_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; + long freq; + int freq_index; + int low_freq = ADT7470_CFG_LF; + int freq_bits; + unsigned char val; + + if (kstrtol(buf, 10, &freq)) + return -EINVAL; + + /* Round the user value given to the closest available frequency */ + freq_index = find_closest(freq, adt7470_freq_map, + ARRAY_SIZE(adt7470_freq_map)); + freq = adt7470_freq_map[freq_index]; + + switch (freq) { + case 11: + freq_bits = ADT7470_CFG_LF_11_0_HZ; + break; + case 15: + freq_bits = ADT7470_CFG_LF_14_7_HZ; + break; + case 22: + freq_bits = ADT7470_CFG_LF_22_1_HZ; + break; + case 29: + freq_bits = ADT7470_CFG_LF_29_4_HZ; + break; + case 35: + freq_bits = ADT7470_CFG_LF_35_3_HZ; + break; + case 44: + freq_bits = ADT7470_CFG_LF_44_1_HZ; + break; + case 59: + freq_bits = ADT7470_CFG_LF_58_8_HZ; + break; + case 88: + freq_bits = ADT7470_CFG_LF_88_2_HZ; + break; + case 1400: + freq_bits = ADT7470_CFG_HF_1_4_KHZ; + low_freq = 0; + break; + case 22500: + freq_bits = ADT7470_CFG_HF_22_5_KHZ; + low_freq = 0; + break; + default: + return -EINVAL; + } + + mutex_lock(&data->lock); + /* Configuration Register 1 */ + val = i2c_smbus_read_byte_data(client, ADT7470_REG_CFG); + i2c_smbus_write_byte_data(client, ADT7470_REG_CFG, + (val & ~ADT7470_CFG_LF) | low_freq); + /* Configuration Register 2 */ + val = i2c_smbus_read_byte_data(client, ADT7470_REG_CFG_2); + i2c_smbus_write_byte_data(client, ADT7470_REG_CFG_2, + (val & ~ADT7470_FREQ_BITS) | freq_bits); + mutex_unlock(&data->lock); + + return count; +} + static ssize_t show_pwm_max(struct device *dev, struct device_attribute *devattr, char *buf) @@ -1038,6 +1184,8 @@ static SENSOR_DEVICE_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 1); static SENSOR_DEVICE_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 2); static SENSOR_DEVICE_ATTR(pwm4, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 3); +static DEVICE_ATTR(pwm1_freq, S_IWUSR | S_IRUGO, show_pwm_freq, set_pwm_freq); + static SENSOR_DEVICE_ATTR(pwm1_auto_point1_pwm, S_IWUSR | S_IRUGO, show_pwm_min, set_pwm_min, 0); static SENSOR_DEVICE_ATTR(pwm2_auto_point1_pwm, S_IWUSR | S_IRUGO, @@ -1096,6 +1244,7 @@ static struct attribute *adt7470_attrs[] = { &dev_attr_alarm_mask.attr, &dev_attr_num_temp_sensors.attr, &dev_attr_auto_update_interval.attr, + &dev_attr_pwm1_freq.attr, &sensor_dev_attr_temp1_max.dev_attr.attr, &sensor_dev_attr_temp2_max.dev_attr.attr, &sensor_dev_attr_temp3_max.dev_attr.attr,