Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6108cd47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.3-rc2' of... 

Merge tag 'hwmon-for-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "A couple of hwmon bug fixes:

   - Update k8temp documentation URL

   - Register address fixes in nct6775 driver

   - Fix potential division by zero in occ driver"

* tag 'hwmon-for-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (k8temp) documentation: update URL of datasheet
  hwmon: (nct6775) Fix register address and added missed tolerance for nct6106
  hwmon: (occ) Fix division by zero issue
parents 6789f873 223b2b50

Documentation/hwmon/k8temp.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Supported chips: 


    Addresses scanned: PCI space



    Datasheet: http://support.amd.com/us/Processor_TechDocs/32559.pdf

    Datasheet: http://www.amd.com/system/files/TechDocs/32559.pdf



Author: Rudolf Marek

drivers/hwmon/nct6775.c

+2 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ static const u16 NCT6106_REG_TARGET[] = { 0x111, 0x121, 0x131 }; 
static const u16 NCT6106_REG_WEIGHT_TEMP_SEL[] = { 0x168, 0x178, 0x188 };

static const u16 NCT6106_REG_WEIGHT_TEMP_STEP[] = { 0x169, 0x179, 0x189 };

static const u16 NCT6106_REG_WEIGHT_TEMP_STEP_TOL[] = { 0x16a, 0x17a, 0x18a };

static const u16 NCT6106_REG_WEIGHT_DUTY_STEP[] = { 0x16b, 0x17b, 0x17c };

static const u16 NCT6106_REG_WEIGHT_DUTY_STEP[] = { 0x16b, 0x17b, 0x18b };

static const u16 NCT6106_REG_WEIGHT_TEMP_BASE[] = { 0x16c, 0x17c, 0x18c };

static const u16 NCT6106_REG_WEIGHT_DUTY_BASE[] = { 0x16d, 0x17d, 0x18d };
@@ -3764,6 +3764,7 @@ static int nct6775_probe(struct platform_device *pdev) 
		data->REG_FAN_TIME[0] = NCT6106_REG_FAN_STOP_TIME;

		data->REG_FAN_TIME[1] = NCT6106_REG_FAN_STEP_UP_TIME;

		data->REG_FAN_TIME[2] = NCT6106_REG_FAN_STEP_DOWN_TIME;

		data->REG_TOLERANCE_H = NCT6106_REG_TOLERANCE_H;

		data->REG_PWM[0] = NCT6106_REG_PWM;

		data->REG_PWM[1] = NCT6106_REG_FAN_START_OUTPUT;

		data->REG_PWM[2] = NCT6106_REG_FAN_STOP_OUTPUT;

drivers/hwmon/occ/common.c

+4 −2
Original line number Diff line number Diff line
@@ -408,8 +408,10 @@ static ssize_t occ_show_power_1(struct device *dev, 


static u64 occ_get_powr_avg(u64 *accum, u32 *samples)

{

	return div64_u64(get_unaligned_be64(accum) * 1000000ULL,

			 get_unaligned_be32(samples));

	u64 divisor = get_unaligned_be32(samples);



	return (divisor == 0) ? 0 :

		div64_u64(get_unaligned_be64(accum) * 1000000ULL, divisor);

}



static ssize_t occ_show_power_2(struct device *dev,