Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-5
+1
Documentation/hwmon/coretemp
+1
Documentation/hwmon/coretemp
+1
-2
Documentation/hwmon/submitting-patches
+1
-2
Documentation/hwmon/submitting-patches
···
60
60
61
61
* Add the driver to Kconfig and Makefile in alphabetical order.
62
62
63
-
* Make sure that all dependencies are listed in Kconfig. For new drivers, it
64
-
is most likely prudent to add a dependency on EXPERIMENTAL.
63
+
* Make sure that all dependencies are listed in Kconfig.
65
64
66
65
* Avoid forward declarations if you can. Rearrange the code if necessary.
67
66
+5
-2
drivers/hwmon/coretemp.c
+5
-2
drivers/hwmon/coretemp.c
···
205
205
{ "CPU N455", 100000 },
206
206
{ "CPU N470", 100000 },
207
207
{ "CPU N475", 100000 },
208
-
{ "CPU 230", 100000 },
209
-
{ "CPU 330", 125000 },
208
+
{ "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
209
+
{ "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
210
+
{ "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 */
211
+
{ "CPU CE4150", 110000 }, /* Model 0x1c, stepping 10 */
212
+
{ "CPU CE4170", 110000 }, /* Model 0x1c, stepping 10 */
210
213
};
211
214
212
215
static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,