Commit e80bd270 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -105,6 +105,7 @@ Process Processor TjMax(C) ...@@ -105,6 +105,7 @@ Process Processor TjMax(C)
330/230 125 330/230 125
E680/660/640/620 90 E680/660/640/620 90
E680T/660T/640T/620T 110 E680T/660T/640T/620T 110
CE4170/4150/4110 110
45nm Core2 Processors 45nm Core2 Processors
Solo ULV SU3500/3300 100 Solo ULV SU3500/3300 100
......
...@@ -60,8 +60,7 @@ increase the chances of your change being accepted. ...@@ -60,8 +60,7 @@ increase the chances of your change being accepted.
* Add the driver to Kconfig and Makefile in alphabetical order. * Add the driver to Kconfig and Makefile in alphabetical order.
* Make sure that all dependencies are listed in Kconfig. For new drivers, it * Make sure that all dependencies are listed in Kconfig.
is most likely prudent to add a dependency on EXPERIMENTAL.
* Avoid forward declarations if you can. Rearrange the code if necessary. * Avoid forward declarations if you can. Rearrange the code if necessary.
......
...@@ -205,8 +205,11 @@ static const struct tjmax __cpuinitconst tjmax_table[] = { ...@@ -205,8 +205,11 @@ static const struct tjmax __cpuinitconst tjmax_table[] = {
{ "CPU N455", 100000 }, { "CPU N455", 100000 },
{ "CPU N470", 100000 }, { "CPU N470", 100000 },
{ "CPU N475", 100000 }, { "CPU N475", 100000 },
{ "CPU 230", 100000 }, { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
{ "CPU 330", 125000 }, { "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, static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
menuconfig PMBUS menuconfig PMBUS
tristate "PMBus support" tristate "PMBus support"
depends on I2C && EXPERIMENTAL depends on I2C
default n default n
help help
Say yes here if you want to enable PMBus support. Say yes here if you want to enable PMBus support.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment