mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
hwmon updates for 3.13-rc1 [#2]
acpi_power_meter: Fix return value check from call to acpi_bus_get_device nct6775: Fix/improve NCT6791 support lm75: Add support for GMT G751 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJSjkXdAAoJEMsfJm/On5mBmkQQAJ+2jsFwKWFfIYyg1U9KCHB2 Skxfw6VEG+BBO+S7DW5/qFGAlBMl7m01MG1B008G6G3JMWBcpJchrtYzOahDAgKE CEc1GOG30VDxfpxM66gU0R4qtkWZF2jbbf4tNWKJoDStKcjJKt5/upt2b9mJpN7M 9S/efq/S4qIG8yLBeC8K5A+MPvus+c5+cfG4lpr1yBxrUiV60qG6Z/r+2KMCUHTe 1Vl7ZCJZzdl2Nbhf3cmYC8kmShYDis0629NpyzbD68I+XdR+CuS2cYY4HL9FKfhy 2FcLWp6GHT0vq8k3aSvpSykVPm0gqQJyKh5RKIzORJEYQFarIrUya5xcWBJiTKHG npnhgiYIIEHXUnbXbPc6Iy8laH1PpLCLWH3ExNkWlQeSXPy1Jf1HJVgDCoMEqRwZ 1xTbSlB09WdNWXtpFkmH4UblyRyJ1cKjpdK3cO0PScVgYB1ljzB2MX0qd7rAvZ2/ Fxp21Q3r/L3ogEbMdu77mnlYZA2NWFmIqlO1IoWkEhf4mhgGUrx/eTDpQuPd/OUq EvB0xNfdArbjnOgk7NdT89W8auOqmXtiE3AaYB3WT8FNeqb2pN9JUGf/GO8DpcPQ EASSpjHYGlKXudBfldH6E86QhXpLOKIABwsNHYLogJVBZ4QaSPLLZHt0473Vslg/ urMSSlfrfLg3bVKAqgnx =ObF6 -----END PGP SIGNATURE----- Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: - acpi_power_meter: Fix return value check from call to acpi_bus_get_device - nct6775: Fix/improve NCT6791 support - lm75: Add support for GMT G751 * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (acpi_power_meter) Fix acpi_bus_get_device() return value check hwmon: (nct6775) NCT6791 supports weight control only for CPUFAN hwmon: (nct6775) Monitor additional temperature registers hwmon: (lm75) Add support for GMT G751 chip
This commit is contained in:
Linus Torvalds
commit
0032cdefff
@ -36,6 +36,7 @@ fsl,mc13892 MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
|
||||
fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
|
||||
fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller
|
||||
fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec
|
||||
gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
|
||||
infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
|
||||
infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz)
|
||||
maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator
|
||||
|
||||
@ -656,6 +656,7 @@ config SENSORS_LM75
|
||||
|
||||
- Analog Devices ADT75
|
||||
- Dallas Semiconductor DS75, DS1775 and DS7505
|
||||
- Global Mixed-mode Technology (GMT) G751
|
||||
- Maxim MAX6625 and MAX6626
|
||||
- Microchip MCP980x
|
||||
- National Semiconductor LM75, LM75A
|
||||
|
||||
@ -602,9 +602,8 @@ static int read_domain_devices(struct acpi_power_meter_resource *resource)
|
||||
|
||||
/* Create a symlink to domain objects */
|
||||
resource->domain_devices[i] = NULL;
|
||||
status = acpi_bus_get_device(element->reference.handle,
|
||||
&resource->domain_devices[i]);
|
||||
if (ACPI_FAILURE(status))
|
||||
if (acpi_bus_get_device(element->reference.handle,
|
||||
&resource->domain_devices[i]))
|
||||
continue;
|
||||
|
||||
obj = resource->domain_devices[i];
|
||||
|
||||
@ -39,6 +39,7 @@ enum lm75_type { /* keep sorted in alphabetical order */
|
||||
ds1775,
|
||||
ds75,
|
||||
ds7505,
|
||||
g751,
|
||||
lm75,
|
||||
lm75a,
|
||||
max6625,
|
||||
@ -208,6 +209,7 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
data->resolution = 12;
|
||||
data->sample_time = HZ / 4;
|
||||
break;
|
||||
case g751:
|
||||
case lm75:
|
||||
case lm75a:
|
||||
data->resolution = 9;
|
||||
@ -296,6 +298,7 @@ static const struct i2c_device_id lm75_ids[] = {
|
||||
{ "ds1775", ds1775, },
|
||||
{ "ds75", ds75, },
|
||||
{ "ds7505", ds7505, },
|
||||
{ "g751", g751, },
|
||||
{ "lm75", lm75, },
|
||||
{ "lm75a", lm75a, },
|
||||
{ "max6625", max6625, },
|
||||
|
||||
@ -274,6 +274,8 @@ static const u16 NCT6775_FAN_PULSE_SHIFT[] = { 0, 0, 0, 0, 0, 0 };
|
||||
static const u16 NCT6775_REG_TEMP[] = {
|
||||
0x27, 0x150, 0x250, 0x62b, 0x62c, 0x62d };
|
||||
|
||||
static const u16 NCT6775_REG_TEMP_MON[] = { 0x73, 0x75, 0x77 };
|
||||
|
||||
static const u16 NCT6775_REG_TEMP_CONFIG[ARRAY_SIZE(NCT6775_REG_TEMP)] = {
|
||||
0, 0x152, 0x252, 0x628, 0x629, 0x62A };
|
||||
static const u16 NCT6775_REG_TEMP_HYST[ARRAY_SIZE(NCT6775_REG_TEMP)] = {
|
||||
@ -454,6 +456,7 @@ static const u16 NCT6779_REG_CRITICAL_PWM[] = {
|
||||
0x137, 0x237, 0x337, 0x837, 0x937, 0xa37 };
|
||||
|
||||
static const u16 NCT6779_REG_TEMP[] = { 0x27, 0x150 };
|
||||
static const u16 NCT6779_REG_TEMP_MON[] = { 0x73, 0x75, 0x77, 0x79, 0x7b };
|
||||
static const u16 NCT6779_REG_TEMP_CONFIG[ARRAY_SIZE(NCT6779_REG_TEMP)] = {
|
||||
0x18, 0x152 };
|
||||
static const u16 NCT6779_REG_TEMP_HYST[ARRAY_SIZE(NCT6779_REG_TEMP)] = {
|
||||
@ -507,6 +510,13 @@ static const u16 NCT6779_REG_TEMP_CRIT[ARRAY_SIZE(nct6779_temp_label) - 1]
|
||||
|
||||
#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
|
||||
|
||||
static const u16 NCT6791_REG_WEIGHT_TEMP_SEL[6] = { 0, 0x239 };
|
||||
static const u16 NCT6791_REG_WEIGHT_TEMP_STEP[6] = { 0, 0x23a };
|
||||
static const u16 NCT6791_REG_WEIGHT_TEMP_STEP_TOL[6] = { 0, 0x23b };
|
||||
static const u16 NCT6791_REG_WEIGHT_DUTY_STEP[6] = { 0, 0x23c };
|
||||
static const u16 NCT6791_REG_WEIGHT_TEMP_BASE[6] = { 0, 0x23d };
|
||||
static const u16 NCT6791_REG_WEIGHT_DUTY_BASE[6] = { 0, 0x23e };
|
||||
|
||||
static const u16 NCT6791_REG_ALARM[NUM_REG_ALARM] = {
|
||||
0x459, 0x45A, 0x45B, 0x568, 0x45D };
|
||||
|
||||
@ -534,6 +544,7 @@ static const u16 NCT6106_REG_IN[] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09 };
|
||||
|
||||
static const u16 NCT6106_REG_TEMP[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15 };
|
||||
static const u16 NCT6106_REG_TEMP_MON[] = { 0x18, 0x19, 0x1a };
|
||||
static const u16 NCT6106_REG_TEMP_HYST[] = {
|
||||
0xc3, 0xc7, 0xcb, 0xcf, 0xd3, 0xd7 };
|
||||
static const u16 NCT6106_REG_TEMP_OVER[] = {
|
||||
@ -1307,6 +1318,9 @@ static void nct6775_update_pwm(struct device *dev)
|
||||
if (reg & 0x80)
|
||||
data->pwm[2][i] = 0;
|
||||
|
||||
if (!data->REG_WEIGHT_TEMP_SEL[i])
|
||||
continue;
|
||||
|
||||
reg = nct6775_read_value(data, data->REG_WEIGHT_TEMP_SEL[i]);
|
||||
data->pwm_weight_temp_sel[i] = reg & 0x1f;
|
||||
/* If weight is disabled, report weight source as 0 */
|
||||
@ -2852,6 +2866,9 @@ static umode_t nct6775_pwm_is_visible(struct kobject *kobj,
|
||||
if (!(data->has_pwm & (1 << pwm)))
|
||||
return 0;
|
||||
|
||||
if ((nr >= 14 && nr <= 18) || nr == 21) /* weight */
|
||||
if (!data->REG_WEIGHT_TEMP_SEL[pwm])
|
||||
return 0;
|
||||
if (nr == 19 && data->REG_PWM[3] == NULL) /* pwm_max */
|
||||
return 0;
|
||||
if (nr == 20 && data->REG_PWM[4] == NULL) /* pwm_step */
|
||||
@ -2945,11 +2962,11 @@ static struct sensor_device_template *nct6775_attributes_pwm_template[] = {
|
||||
&sensor_dev_template_pwm_step_down_time,
|
||||
&sensor_dev_template_pwm_start,
|
||||
&sensor_dev_template_pwm_floor,
|
||||
&sensor_dev_template_pwm_weight_temp_sel,
|
||||
&sensor_dev_template_pwm_weight_temp_sel, /* 14 */
|
||||
&sensor_dev_template_pwm_weight_temp_step,
|
||||
&sensor_dev_template_pwm_weight_temp_step_tol,
|
||||
&sensor_dev_template_pwm_weight_temp_step_base,
|
||||
&sensor_dev_template_pwm_weight_duty_step,
|
||||
&sensor_dev_template_pwm_weight_duty_step, /* 18 */
|
||||
&sensor_dev_template_pwm_max, /* 19 */
|
||||
&sensor_dev_template_pwm_step, /* 20 */
|
||||
&sensor_dev_template_pwm_weight_duty_base, /* 21 */
|
||||
@ -3253,9 +3270,9 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
int i, s, err = 0;
|
||||
int src, mask, available;
|
||||
const u16 *reg_temp, *reg_temp_over, *reg_temp_hyst, *reg_temp_config;
|
||||
const u16 *reg_temp_alternate, *reg_temp_crit;
|
||||
const u16 *reg_temp_mon, *reg_temp_alternate, *reg_temp_crit;
|
||||
const u16 *reg_temp_crit_l = NULL, *reg_temp_crit_h = NULL;
|
||||
int num_reg_temp;
|
||||
int num_reg_temp, num_reg_temp_mon;
|
||||
u8 cr2a;
|
||||
struct attribute_group *group;
|
||||
struct device *hwmon_dev;
|
||||
@ -3338,7 +3355,9 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->BEEP_BITS = NCT6106_BEEP_BITS;
|
||||
|
||||
reg_temp = NCT6106_REG_TEMP;
|
||||
reg_temp_mon = NCT6106_REG_TEMP_MON;
|
||||
num_reg_temp = ARRAY_SIZE(NCT6106_REG_TEMP);
|
||||
num_reg_temp_mon = ARRAY_SIZE(NCT6106_REG_TEMP_MON);
|
||||
reg_temp_over = NCT6106_REG_TEMP_OVER;
|
||||
reg_temp_hyst = NCT6106_REG_TEMP_HYST;
|
||||
reg_temp_config = NCT6106_REG_TEMP_CONFIG;
|
||||
@ -3410,7 +3429,9 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->REG_BEEP = NCT6775_REG_BEEP;
|
||||
|
||||
reg_temp = NCT6775_REG_TEMP;
|
||||
reg_temp_mon = NCT6775_REG_TEMP_MON;
|
||||
num_reg_temp = ARRAY_SIZE(NCT6775_REG_TEMP);
|
||||
num_reg_temp_mon = ARRAY_SIZE(NCT6775_REG_TEMP_MON);
|
||||
reg_temp_over = NCT6775_REG_TEMP_OVER;
|
||||
reg_temp_hyst = NCT6775_REG_TEMP_HYST;
|
||||
reg_temp_config = NCT6775_REG_TEMP_CONFIG;
|
||||
@ -3480,7 +3501,9 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->REG_BEEP = NCT6776_REG_BEEP;
|
||||
|
||||
reg_temp = NCT6775_REG_TEMP;
|
||||
reg_temp_mon = NCT6775_REG_TEMP_MON;
|
||||
num_reg_temp = ARRAY_SIZE(NCT6775_REG_TEMP);
|
||||
num_reg_temp_mon = ARRAY_SIZE(NCT6775_REG_TEMP_MON);
|
||||
reg_temp_over = NCT6775_REG_TEMP_OVER;
|
||||
reg_temp_hyst = NCT6775_REG_TEMP_HYST;
|
||||
reg_temp_config = NCT6776_REG_TEMP_CONFIG;
|
||||
@ -3554,7 +3577,9 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->REG_BEEP = NCT6776_REG_BEEP;
|
||||
|
||||
reg_temp = NCT6779_REG_TEMP;
|
||||
reg_temp_mon = NCT6779_REG_TEMP_MON;
|
||||
num_reg_temp = ARRAY_SIZE(NCT6779_REG_TEMP);
|
||||
num_reg_temp_mon = ARRAY_SIZE(NCT6779_REG_TEMP_MON);
|
||||
reg_temp_over = NCT6779_REG_TEMP_OVER;
|
||||
reg_temp_hyst = NCT6779_REG_TEMP_HYST;
|
||||
reg_temp_config = NCT6779_REG_TEMP_CONFIG;
|
||||
@ -3603,8 +3628,8 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->REG_PWM[0] = NCT6775_REG_PWM;
|
||||
data->REG_PWM[1] = NCT6775_REG_FAN_START_OUTPUT;
|
||||
data->REG_PWM[2] = NCT6775_REG_FAN_STOP_OUTPUT;
|
||||
data->REG_PWM[5] = NCT6775_REG_WEIGHT_DUTY_STEP;
|
||||
data->REG_PWM[6] = NCT6776_REG_WEIGHT_DUTY_BASE;
|
||||
data->REG_PWM[5] = NCT6791_REG_WEIGHT_DUTY_STEP;
|
||||
data->REG_PWM[6] = NCT6791_REG_WEIGHT_DUTY_BASE;
|
||||
data->REG_PWM_READ = NCT6775_REG_PWM_READ;
|
||||
data->REG_PWM_MODE = NCT6776_REG_PWM_MODE;
|
||||
data->PWM_MODE_MASK = NCT6776_PWM_MODE_MASK;
|
||||
@ -3620,15 +3645,17 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
data->REG_TEMP_OFFSET = NCT6779_REG_TEMP_OFFSET;
|
||||
data->REG_TEMP_SOURCE = NCT6775_REG_TEMP_SOURCE;
|
||||
data->REG_TEMP_SEL = NCT6775_REG_TEMP_SEL;
|
||||
data->REG_WEIGHT_TEMP_SEL = NCT6775_REG_WEIGHT_TEMP_SEL;
|
||||
data->REG_WEIGHT_TEMP[0] = NCT6775_REG_WEIGHT_TEMP_STEP;
|
||||
data->REG_WEIGHT_TEMP[1] = NCT6775_REG_WEIGHT_TEMP_STEP_TOL;
|
||||
data->REG_WEIGHT_TEMP[2] = NCT6775_REG_WEIGHT_TEMP_BASE;
|
||||
data->REG_WEIGHT_TEMP_SEL = NCT6791_REG_WEIGHT_TEMP_SEL;
|
||||
data->REG_WEIGHT_TEMP[0] = NCT6791_REG_WEIGHT_TEMP_STEP;
|
||||
data->REG_WEIGHT_TEMP[1] = NCT6791_REG_WEIGHT_TEMP_STEP_TOL;
|
||||
data->REG_WEIGHT_TEMP[2] = NCT6791_REG_WEIGHT_TEMP_BASE;
|
||||
data->REG_ALARM = NCT6791_REG_ALARM;
|
||||
data->REG_BEEP = NCT6776_REG_BEEP;
|
||||
|
||||
reg_temp = NCT6779_REG_TEMP;
|
||||
reg_temp_mon = NCT6779_REG_TEMP_MON;
|
||||
num_reg_temp = ARRAY_SIZE(NCT6779_REG_TEMP);
|
||||
num_reg_temp_mon = ARRAY_SIZE(NCT6779_REG_TEMP_MON);
|
||||
reg_temp_over = NCT6779_REG_TEMP_OVER;
|
||||
reg_temp_hyst = NCT6779_REG_TEMP_HYST;
|
||||
reg_temp_config = NCT6779_REG_TEMP_CONFIG;
|
||||
@ -3729,6 +3756,50 @@ static int nct6775_probe(struct platform_device *pdev)
|
||||
s++;
|
||||
}
|
||||
|
||||
/*
|
||||
* Repeat with temperatures used for fan control.
|
||||
* This set of registers does not support limits.
|
||||
*/
|
||||
for (i = 0; i < num_reg_temp_mon; i++) {
|
||||
if (reg_temp_mon[i] == 0)
|
||||
continue;
|
||||
|
||||
src = nct6775_read_value(data, data->REG_TEMP_SEL[i]) & 0x1f;
|
||||
if (!src || (mask & (1 << src)))
|
||||
continue;
|
||||
|
||||
if (src >= data->temp_label_num ||
|
||||
!strlen(data->temp_label[src])) {
|
||||
dev_info(dev,
|
||||
"Invalid temperature source %d at index %d, source register 0x%x, temp register 0x%x\n",
|
||||
src, i, data->REG_TEMP_SEL[i],
|
||||
reg_temp_mon[i]);
|
||||
continue;
|
||||
}
|
||||
|
||||
mask |= 1 << src;
|
||||
|
||||
/* Use fixed index for SYSTIN(1), CPUTIN(2), AUXTIN(3) */
|
||||
if (src <= data->temp_fixed_num) {
|
||||
if (data->have_temp & (1 << (src - 1)))
|
||||
continue;
|
||||
data->have_temp |= 1 << (src - 1);
|
||||
data->have_temp_fixed |= 1 << (src - 1);
|
||||
data->reg_temp[0][src - 1] = reg_temp_mon[i];
|
||||
data->temp_src[src - 1] = src;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (s >= NUM_TEMP)
|
||||
continue;
|
||||
|
||||
/* Use dynamic index for other sources */
|
||||
data->have_temp |= 1 << s;
|
||||
data->reg_temp[0][s] = reg_temp_mon[i];
|
||||
data->temp_src[s] = src;
|
||||
s++;
|
||||
}
|
||||
|
||||
#ifdef USE_ALTERNATE
|
||||
/*
|
||||
* Go through the list of alternate temp registers and enable
|
||||
|
||||
Loading…
Reference in New Issue
Block a user