Couple of patches for the aspeed pwm fan driver
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZMpcxAAoJEMsfJm/On5mBIO8P/R+bF7zbMm9Y02YqnPUp0FRX rH1QqXrPT8lAMXwCqzHwOEypogNnp7UISaG59UAywgEhADbSG3vuqr4R3vUreg3B MITjjscebndGy2/DRRgUfPLbbIJiWQB2KpAvNIyX6PRsmkSQ0YoWAQblfsfrBc5B zV+PRPnHgiKPLxuU6eTWoPdy9QbnbwTTG/JBNECblFD86dPU7Rz0u1iw9H5mQFdV meW5nx5MvBREXyysqFkv3jZQeSNo83Lp8J+yES9ghuExDt7eUWhd9R/aa5cwENRo Odfif+UXbAuebgT92v099xtsc0ibYBxyBrfSZgjMBhr4CkJmqruVUVAdoKPWMfVZ mesasawpo154eepDmtztg06ssczWKnpr5x3Db/yr6kRB8spHtouezzH7+3PM8q5O bX+7s0sYJBmalRFMCfZD7SdnpfNRxOLJtEkK76VuOvuw373kGS5ycBgPOWR9jBRD Cg/+TS85QpwogwQkmIkPJKqBXmUOqtP+XTUPteiL4oYHA67skTqwD6rCMQgfPPnv GpNi7FITXMPMItBj4UajYUtFNI61bdXHEnCLsOKsEBp/8UG5vKxDAEJAxcCJEH/D o/pjrYk4gFCa70RPdKFWOet/d6OSqhG8bhjWCUavm6BH/EtopMAnAhmlI9vKgHyg 76jBv/wbc7G+yUZR+Q8u =GtgN -----END PGP SIGNATURE----- Merge tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: "A couple of patches for the aspeed pwm fan driver" * tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1 hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed hwmon: (aspeed-pwm-tacho) On read failure return -ETIMEDOUT hwmon: (aspeed-pwm-tacho) Select REGMAP
This commit is contained in:
Linus Torvalds
Коммит
ea094f3c83
|
|
@ -343,6 +343,7 @@ config SENSORS_ASB100
|
|||
|
||||
config SENSORS_ASPEED
|
||||
tristate "ASPEED AST2400/AST2500 PWM and Fan tach driver"
|
||||
select REGMAP
|
||||
help
|
||||
This driver provides support for ASPEED AST2400/AST2500 PWM
|
||||
and Fan Tacho controllers.
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/hwmon.h>
|
||||
|
|
@ -494,7 +495,7 @@ static u32 aspeed_get_fan_tach_ch_measure_period(struct aspeed_pwm_tacho_data
|
|||
return clk / (clk_unit * div_h * div_l * tacho_div * tacho_unit);
|
||||
}
|
||||
|
||||
static u32 aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,
|
||||
static int aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,
|
||||
u8 fan_tach_ch)
|
||||
{
|
||||
u32 raw_data, tach_div, clk_source, sec, val;
|
||||
|
|
@ -510,6 +511,9 @@ static u32 aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,
|
|||
msleep(sec);
|
||||
|
||||
regmap_read(priv->regmap, ASPEED_PTCR_RESULT, &val);
|
||||
if (!(val & RESULT_STATUS_MASK))
|
||||
return -ETIMEDOUT;
|
||||
|
||||
raw_data = val & RESULT_VALUE_MASK;
|
||||
tach_div = priv->type_fan_tach_clock_division[type];
|
||||
tach_div = 0x4 << (tach_div * 2);
|
||||
|
|
@ -561,12 +565,14 @@ static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
|
|||
{
|
||||
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
||||
int index = sensor_attr->index;
|
||||
u32 rpm;
|
||||
int rpm;
|
||||
struct aspeed_pwm_tacho_data *priv = dev_get_drvdata(dev);
|
||||
|
||||
rpm = aspeed_get_fan_tach_ch_rpm(priv, index);
|
||||
if (rpm < 0)
|
||||
return rpm;
|
||||
|
||||
return sprintf(buf, "%u\n", rpm);
|
||||
return sprintf(buf, "%d\n", rpm);
|
||||
}
|
||||
|
||||
static umode_t pwm_is_visible(struct kobject *kobj,
|
||||
|
|
@ -591,24 +597,23 @@ static umode_t fan_dev_is_visible(struct kobject *kobj,
|
|||
return a->mode;
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(pwm0, 0644,
|
||||
show_pwm, set_pwm, 0);
|
||||
static SENSOR_DEVICE_ATTR(pwm1, 0644,
|
||||
show_pwm, set_pwm, 1);
|
||||
show_pwm, set_pwm, 0);
|
||||
static SENSOR_DEVICE_ATTR(pwm2, 0644,
|
||||
show_pwm, set_pwm, 2);
|
||||
show_pwm, set_pwm, 1);
|
||||
static SENSOR_DEVICE_ATTR(pwm3, 0644,
|
||||
show_pwm, set_pwm, 3);
|
||||
show_pwm, set_pwm, 2);
|
||||
static SENSOR_DEVICE_ATTR(pwm4, 0644,
|
||||
show_pwm, set_pwm, 4);
|
||||
show_pwm, set_pwm, 3);
|
||||
static SENSOR_DEVICE_ATTR(pwm5, 0644,
|
||||
show_pwm, set_pwm, 5);
|
||||
show_pwm, set_pwm, 4);
|
||||
static SENSOR_DEVICE_ATTR(pwm6, 0644,
|
||||
show_pwm, set_pwm, 6);
|
||||
show_pwm, set_pwm, 5);
|
||||
static SENSOR_DEVICE_ATTR(pwm7, 0644,
|
||||
show_pwm, set_pwm, 6);
|
||||
static SENSOR_DEVICE_ATTR(pwm8, 0644,
|
||||
show_pwm, set_pwm, 7);
|
||||
static struct attribute *pwm_dev_attrs[] = {
|
||||
&sensor_dev_attr_pwm0.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm1.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm2.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm3.dev_attr.attr,
|
||||
|
|
@ -616,6 +621,7 @@ static struct attribute *pwm_dev_attrs[] = {
|
|||
&sensor_dev_attr_pwm5.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm6.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm7.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm8.dev_attr.attr,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
|
@ -624,40 +630,39 @@ static const struct attribute_group pwm_dev_group = {
|
|||
.is_visible = pwm_is_visible,
|
||||
};
|
||||
|
||||
static SENSOR_DEVICE_ATTR(fan0_input, 0444,
|
||||
show_rpm, NULL, 0);
|
||||
static SENSOR_DEVICE_ATTR(fan1_input, 0444,
|
||||
show_rpm, NULL, 1);
|
||||
show_rpm, NULL, 0);
|
||||
static SENSOR_DEVICE_ATTR(fan2_input, 0444,
|
||||
show_rpm, NULL, 2);
|
||||
show_rpm, NULL, 1);
|
||||
static SENSOR_DEVICE_ATTR(fan3_input, 0444,
|
||||
show_rpm, NULL, 3);
|
||||
show_rpm, NULL, 2);
|
||||
static SENSOR_DEVICE_ATTR(fan4_input, 0444,
|
||||
show_rpm, NULL, 4);
|
||||
show_rpm, NULL, 3);
|
||||
static SENSOR_DEVICE_ATTR(fan5_input, 0444,
|
||||
show_rpm, NULL, 5);
|
||||
show_rpm, NULL, 4);
|
||||
static SENSOR_DEVICE_ATTR(fan6_input, 0444,
|
||||
show_rpm, NULL, 6);
|
||||
show_rpm, NULL, 5);
|
||||
static SENSOR_DEVICE_ATTR(fan7_input, 0444,
|
||||
show_rpm, NULL, 7);
|
||||
show_rpm, NULL, 6);
|
||||
static SENSOR_DEVICE_ATTR(fan8_input, 0444,
|
||||
show_rpm, NULL, 8);
|
||||
show_rpm, NULL, 7);
|
||||
static SENSOR_DEVICE_ATTR(fan9_input, 0444,
|
||||
show_rpm, NULL, 9);
|
||||
show_rpm, NULL, 8);
|
||||
static SENSOR_DEVICE_ATTR(fan10_input, 0444,
|
||||
show_rpm, NULL, 10);
|
||||
show_rpm, NULL, 9);
|
||||
static SENSOR_DEVICE_ATTR(fan11_input, 0444,
|
||||
show_rpm, NULL, 11);
|
||||
show_rpm, NULL, 10);
|
||||
static SENSOR_DEVICE_ATTR(fan12_input, 0444,
|
||||
show_rpm, NULL, 12);
|
||||
show_rpm, NULL, 11);
|
||||
static SENSOR_DEVICE_ATTR(fan13_input, 0444,
|
||||
show_rpm, NULL, 13);
|
||||
show_rpm, NULL, 12);
|
||||
static SENSOR_DEVICE_ATTR(fan14_input, 0444,
|
||||
show_rpm, NULL, 14);
|
||||
show_rpm, NULL, 13);
|
||||
static SENSOR_DEVICE_ATTR(fan15_input, 0444,
|
||||
show_rpm, NULL, 14);
|
||||
static SENSOR_DEVICE_ATTR(fan16_input, 0444,
|
||||
show_rpm, NULL, 15);
|
||||
static struct attribute *fan_dev_attrs[] = {
|
||||
&sensor_dev_attr_fan0_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan1_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan2_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan3_input.dev_attr.attr,
|
||||
|
|
@ -673,6 +678,7 @@ static struct attribute *fan_dev_attrs[] = {
|
|||
&sensor_dev_attr_fan13_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan14_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan15_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan16_input.dev_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
|
@ -802,7 +808,6 @@ static int aspeed_pwm_tacho_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
of_node_put(np);
|
||||
|
||||
priv->groups[0] = &pwm_dev_group;
|
||||
priv->groups[1] = &fan_dev_group;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче