Commit 9418d5dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: (i5k_amb) Convert macros to C functions
  hwmon: (w83781d) Add missing curly braces
  hwmon: (abituguru3) Identify ABit IP35 Pro as such
  hwmon: (f75375s) pwmX_mode sysfs files writable for f75375 variant
  hwmon: (f75375s) On n2100 systems, set fans to full speed on boot
  hwmon: (f75375s) Allow setting up fans with platform_data
  hwmon: (f75375s) Add new style bindings
  hwmon: (lm70) Convert semaphore to mutex
  hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core
  hwmon: (abituguru3) Add support for 2 new motherboards
  hwmon: (ibmpex) Change printk to dev_{info,err} macros
  hwmon: (i5k_amb) New memory temperature sensor driver
  hwmon: (f75375s) fix pwm mode setting
  hwmon: (ibmpex.c) fix NULL dereference
  hwmon: (sis5595) Split sis5595_attributes_opt
  hwmon: (sis5595) Add individual alarm files
  hwmon: (w83627hf) push nr+1 offset into *_REG_FAN macros and simplify
  hwmon: (w83627hf) hoist nr-1 offset out of show-store-temp-X
  hwmon: Add power meter spec to Documentation/hwmon/sysfs-interface
parents 31083eba 59a030a9

Documentation/hwmon/sysfs-interface

+31 −0
Original line number Diff line number Diff line
@@ -328,6 +328,37 @@ curr[1-*]_input Current input value 
		Unit: milliampere

		RO



*********

* Power *

*********



power[1-*]_average		Average power use

				Unit: microWatt

				RO



power[1-*]_average_highest	Historical average maximum power use

				Unit: microWatt

				RO



power[1-*]_average_lowest	Historical average minimum power use

				Unit: microWatt

				RO



power[1-*]_input		Instantaneous power use

				Unit: microWatt

				RO



power[1-*]_input_highest	Historical maximum power use

				Unit: microWatt

				RO



power[1-*]_input_lowest		Historical minimum power use

				Unit: microWatt

				RO



power[1-*]_reset_history	Reset input_highest, input_lowest,

				average_highest and average_lowest.

				WO



**********

* Alarms *

arch/arm/mach-iop32x/n2100.c

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <linux/mm.h>

#include <linux/init.h>

#include <linux/f75375s.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/pci.h>
@@ -200,11 +201,21 @@ static struct platform_device n2100_serial_device = { 
	.resource	= &n2100_uart_resource,

};



static struct f75375s_platform_data n2100_f75375s = {

	.pwm		= { 255, 255 },

	.pwm_enable = { 0, 0 },

};



static struct i2c_board_info __initdata n2100_i2c_devices[] = {

	{

		I2C_BOARD_INFO("rtc-rs5c372", 0x32),

		.type = "rs5c372b",

	},

	{

		I2C_BOARD_INFO("f75375", 0x2e),

		.type = "f75375",

		.platform_data = &n2100_f75375s,

	},

};



/*

drivers/hwmon/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -216,6 +216,16 @@ config SENSORS_DS1621 
	  This driver can also be built as a module.  If so, the module

	  will be called ds1621.



config SENSORS_I5K_AMB

	tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"

	depends on PCI && EXPERIMENTAL

	help

	  If you say yes here you get support for FB-DIMM AMB temperature

	  monitoring chips on systems with the Intel 5000 series chipset.



	  This driver can also be built as a module. If so, the module

	  will be called i5k_amb.



config SENSORS_F71805F

	tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"

	depends on EXPERIMENTAL

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o 
obj-$(CONFIG_SENSORS_GL518SM)	+= gl518sm.o

obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o

obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o

obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o

obj-$(CONFIG_SENSORS_IT87)	+= it87.o

obj-$(CONFIG_SENSORS_K8TEMP)	+= k8temp.o

drivers/hwmon/abituguru3.c

+55 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX3 FAN",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x001A, "unknown", {

	{ 0x001A, "Abit IP35 Pro", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR2",		 1, 0, 20, 1, 0 },

		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },
@@ -530,6 +530,60 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX3 Fan",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x001B, "unknown", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR3",		 1, 0, 20, 1, 0 },

		{ "DDR3 VTT",		 2, 0, 10, 1, 0 },

		{ "CPU VTT",		 3, 0, 10, 1, 0 },

		{ "MCH 1.25V",		 4, 0, 10, 1, 0 },

		{ "ICHIO 1.5V",		 5, 0, 10, 1, 0 },

		{ "ICH 1.05V",		 6, 0, 10, 1, 0 },

		{ "ATX +12V (24-Pin)",	 7, 0, 60, 1, 0 },

		{ "ATX +12V (8-pin)",	 8, 0, 60, 1, 0 },

		{ "ATX +5V",		 9, 0, 30, 1, 0 },

		{ "+3.3V",		10, 0, 20, 1, 0 },

		{ "5VSB",		11, 0, 30, 1, 0 },

		{ "CPU",		24, 1, 1, 1, 0 },

		{ "System",		25, 1, 1, 1, 0 },

		{ "PWM Phase1",		26, 1, 1, 1, 0 },

		{ "PWM Phase2",		27, 1, 1, 1, 0 },

		{ "PWM Phase3",		28, 1, 1, 1, 0 },

		{ "PWM Phase4",		29, 1, 1, 1, 0 },

		{ "PWM Phase5",		30, 1, 1, 1, 0 },

		{ "CPU Fan",		32, 2, 60, 1, 0 },

		{ "SYS Fan",		34, 2, 60, 1, 0 },

		{ "AUX1 Fan",		33, 2, 60, 1, 0 },

		{ "AUX2 Fan",		35, 2, 60, 1, 0 },

		{ "AUX3 Fan",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x001C, "unknown", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR2",		 1, 0, 20, 1, 0 },

		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },

		{ "CPU VTT",		 3, 0, 10, 1, 0 },

		{ "MCH 1.25V",		 4, 0, 10, 1, 0 },

		{ "ICHIO 1.5V",		 5, 0, 10, 1, 0 },

		{ "ICH 1.05V",		 6, 0, 10, 1, 0 },

		{ "ATX +12V (24-Pin)",	 7, 0, 60, 1, 0 },

		{ "ATX +12V (8-pin)",	 8, 0, 60, 1, 0 },

		{ "ATX +5V",		 9, 0, 30, 1, 0 },

		{ "+3.3V",		10, 0, 20, 1, 0 },

		{ "5VSB",		11, 0, 30, 1, 0 },

		{ "CPU",		24, 1, 1, 1, 0 },

		{ "System",		25, 1, 1, 1, 0 },

		{ "PWM Phase1",		26, 1, 1, 1, 0 },

		{ "PWM Phase2",		27, 1, 1, 1, 0 },

		{ "PWM Phase3",		28, 1, 1, 1, 0 },

		{ "PWM Phase4",		29, 1, 1, 1, 0 },

		{ "PWM Phase5",		30, 1, 1, 1, 0 },

		{ "CPU Fan",		32, 2, 60, 1, 0 },

		{ "SYS Fan",		34, 2, 60, 1, 0 },

		{ "AUX1 Fan",		33, 2, 60, 1, 0 },

		{ "AUX2 Fan",		35, 2, 60, 1, 0 },

		{ "AUX3 Fan",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x0000, NULL, { { NULL, 0, 0, 0, 0, 0 } } }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE