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

Commit e80bd270 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon fixes from Guenter Roeck:
 "Drop some leftover dependencies on CONFIG_EXPERIMENTAL, and add
  support for Intel Atom CE4110/4150/4170."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Add support for Atom CE4110/4150/4170
  Documentation/hwmon: remove CONFIG_EXPERIMENTAL
  hwmon: (pmbus) remove CONFIG_EXPERIMENTAL
parents ccfc2730 1102dcab

Documentation/hwmon/coretemp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ Process Processor TjMax(C) 
		330/230						125

		E680/660/640/620				90

		E680T/660T/640T/620T				110

		CE4170/4150/4110				110



45nm		Core2 Processors

		Solo ULV SU3500/3300				100

Documentation/hwmon/submitting-patches

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ increase the chances of your change being accepted. 


* Add the driver to Kconfig and Makefile in alphabetical order.



* Make sure that all dependencies are listed in Kconfig. For new drivers, it

  is most likely prudent to add a dependency on EXPERIMENTAL.

* Make sure that all dependencies are listed in Kconfig.



* Avoid forward declarations if you can. Rearrange the code if necessary.

drivers/hwmon/coretemp.c

+5 −2
Original line number Diff line number Diff line
@@ -205,8 +205,11 @@ static const struct tjmax __cpuinitconst tjmax_table[] = { 
	{ "CPU N455", 100000 },

	{ "CPU N470", 100000 },

	{ "CPU N475", 100000 },

	{ "CPU  230", 100000 },

	{ "CPU  330", 125000 },

	{ "CPU  230", 100000 },		/* Model 0x1c, stepping 2	*/

	{ "CPU  330", 125000 },		/* Model 0x1c, stepping 2	*/

	{ "CPU CE4110", 110000 },	/* Model 0x1c, stepping 10	*/

	{ "CPU CE4150", 110000 },	/* Model 0x1c, stepping 10	*/

	{ "CPU CE4170", 110000 },	/* Model 0x1c, stepping 10	*/

};



static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,

drivers/hwmon/pmbus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


menuconfig PMBUS

	tristate "PMBus support"

	depends on I2C && EXPERIMENTAL

	depends on I2C

	default n

	help

	  Say yes here if you want to enable PMBus support.