← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-lts-vivid/trusty-proposed

« back to all changes in this revision

Viewing changes to drivers/hwmon/nct6775.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Kamal Mostafa, K. Y. Srinivasan
  • Date: 2015-11-23 13:24:32 UTC
  • Revision ID: package-import@ubuntu.com-20151123132432-903xk653el60bfun
https://launchpad.net/bugs/1518519
https://launchpad.net/bugs/1508706
[ Kamal Mostafa ]

* Release Tracking Bug
  - LP: #1518519

[ K. Y. Srinivasan ]

* SAUCE: Drivers: hv: vmbus: Fix a Host signaling bug
  - LP: #1508706

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/hwmon/nct6775.c
353
353
 
354
354
/* NCT6776 specific data */
355
355
 
 
356
/* STEP_UP_TIME and STEP_DOWN_TIME regs are swapped for all chips but NCT6775 */
 
357
#define NCT6776_REG_FAN_STEP_UP_TIME NCT6775_REG_FAN_STEP_DOWN_TIME
 
358
#define NCT6776_REG_FAN_STEP_DOWN_TIME NCT6775_REG_FAN_STEP_UP_TIME
 
359
 
356
360
static const s8 NCT6776_ALARM_BITS[] = {
357
361
        0, 1, 2, 3, 8, 21, 20, 16,      /* in0.. in7 */
358
362
        17, -1, -1, -1, -1, -1, -1,     /* in8..in14 */
3506
3510
                data->REG_FAN_PULSES = NCT6776_REG_FAN_PULSES;
3507
3511
                data->FAN_PULSE_SHIFT = NCT6775_FAN_PULSE_SHIFT;
3508
3512
                data->REG_FAN_TIME[0] = NCT6775_REG_FAN_STOP_TIME;
3509
 
                data->REG_FAN_TIME[1] = NCT6775_REG_FAN_STEP_UP_TIME;
3510
 
                data->REG_FAN_TIME[2] = NCT6775_REG_FAN_STEP_DOWN_TIME;
 
3513
                data->REG_FAN_TIME[1] = NCT6776_REG_FAN_STEP_UP_TIME;
 
3514
                data->REG_FAN_TIME[2] = NCT6776_REG_FAN_STEP_DOWN_TIME;
3511
3515
                data->REG_TOLERANCE_H = NCT6776_REG_TOLERANCE_H;
3512
3516
                data->REG_PWM[0] = NCT6775_REG_PWM;
3513
3517
                data->REG_PWM[1] = NCT6775_REG_FAN_START_OUTPUT;
3578
3582
                data->REG_FAN_PULSES = NCT6779_REG_FAN_PULSES;
3579
3583
                data->FAN_PULSE_SHIFT = NCT6775_FAN_PULSE_SHIFT;
3580
3584
                data->REG_FAN_TIME[0] = NCT6775_REG_FAN_STOP_TIME;
3581
 
                data->REG_FAN_TIME[1] = NCT6775_REG_FAN_STEP_UP_TIME;
3582
 
                data->REG_FAN_TIME[2] = NCT6775_REG_FAN_STEP_DOWN_TIME;
 
3585
                data->REG_FAN_TIME[1] = NCT6776_REG_FAN_STEP_UP_TIME;
 
3586
                data->REG_FAN_TIME[2] = NCT6776_REG_FAN_STEP_DOWN_TIME;
3583
3587
                data->REG_TOLERANCE_H = NCT6776_REG_TOLERANCE_H;
3584
3588
                data->REG_PWM[0] = NCT6775_REG_PWM;
3585
3589
                data->REG_PWM[1] = NCT6775_REG_FAN_START_OUTPUT;
3655
3659
                data->REG_FAN_PULSES = NCT6779_REG_FAN_PULSES;
3656
3660
                data->FAN_PULSE_SHIFT = NCT6775_FAN_PULSE_SHIFT;
3657
3661
                data->REG_FAN_TIME[0] = NCT6775_REG_FAN_STOP_TIME;
3658
 
                data->REG_FAN_TIME[1] = NCT6775_REG_FAN_STEP_UP_TIME;
3659
 
                data->REG_FAN_TIME[2] = NCT6775_REG_FAN_STEP_DOWN_TIME;
 
3662
                data->REG_FAN_TIME[1] = NCT6776_REG_FAN_STEP_UP_TIME;
 
3663
                data->REG_FAN_TIME[2] = NCT6776_REG_FAN_STEP_DOWN_TIME;
3660
3664
                data->REG_TOLERANCE_H = NCT6776_REG_TOLERANCE_H;
3661
3665
                data->REG_PWM[0] = NCT6775_REG_PWM;
3662
3666
                data->REG_PWM[1] = NCT6775_REG_FAN_START_OUTPUT;