diff options
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/Kconfig | 87 | ||||
-rw-r--r-- | drivers/hwmon/Makefile | 10 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/Kconfig | 90 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/Makefile | 12 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/adm1275.c (renamed from drivers/hwmon/adm1275.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/max16064.c (renamed from drivers/hwmon/max16064.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/max34440.c (renamed from drivers/hwmon/max34440.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/max8688.c (renamed from drivers/hwmon/max8688.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/pmbus.c (renamed from drivers/hwmon/pmbus.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/pmbus.h (renamed from drivers/hwmon/pmbus.h) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/pmbus_core.c (renamed from drivers/hwmon/pmbus_core.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/ucd9000.c (renamed from drivers/hwmon/ucd9000.c) | 0 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/ucd9200.c (renamed from drivers/hwmon/ucd9200.c) | 0 |
13 files changed, 104 insertions, 95 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 38c2adba8381..8924820f0966 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -841,92 +841,7 @@ config SENSORS_PCF8591 | |||
841 | These devices are hard to detect and rarely found on mainstream | 841 | These devices are hard to detect and rarely found on mainstream |
842 | hardware. If unsure, say N. | 842 | hardware. If unsure, say N. |
843 | 843 | ||
844 | config PMBUS | 844 | source drivers/hwmon/pmbus/Kconfig |
845 | tristate "PMBus support" | ||
846 | depends on I2C && EXPERIMENTAL | ||
847 | default n | ||
848 | help | ||
849 | Say yes here if you want to enable PMBus support. | ||
850 | |||
851 | This driver can also be built as a module. If so, the module will | ||
852 | be called pmbus_core. | ||
853 | |||
854 | if PMBUS | ||
855 | |||
856 | config SENSORS_PMBUS | ||
857 | tristate "Generic PMBus devices" | ||
858 | default n | ||
859 | help | ||
860 | If you say yes here you get hardware monitoring support for generic | ||
861 | PMBus devices, including but not limited to BMR450, BMR451, BMR453, | ||
862 | BMR454, and LTC2978. | ||
863 | |||
864 | This driver can also be built as a module. If so, the module will | ||
865 | be called pmbus. | ||
866 | |||
867 | config SENSORS_ADM1275 | ||
868 | tristate "Analog Devices ADM1275" | ||
869 | default n | ||
870 | help | ||
871 | If you say yes here you get hardware monitoring support for Analog | ||
872 | Devices ADM1275 Hot-Swap Controller and Digital Power Monitor. | ||
873 | |||
874 | This driver can also be built as a module. If so, the module will | ||
875 | be called adm1275. | ||
876 | |||
877 | config SENSORS_MAX16064 | ||
878 | tristate "Maxim MAX16064" | ||
879 | default n | ||
880 | help | ||
881 | If you say yes here you get hardware monitoring support for Maxim | ||
882 | MAX16064. | ||
883 | |||
884 | This driver can also be built as a module. If so, the module will | ||
885 | be called max16064. | ||
886 | |||
887 | config SENSORS_MAX34440 | ||
888 | tristate "Maxim MAX34440/MAX34441" | ||
889 | default n | ||
890 | help | ||
891 | If you say yes here you get hardware monitoring support for Maxim | ||
892 | MAX34440 and MAX34441. | ||
893 | |||
894 | This driver can also be built as a module. If so, the module will | ||
895 | be called max34440. | ||
896 | |||
897 | config SENSORS_MAX8688 | ||
898 | tristate "Maxim MAX8688" | ||
899 | default n | ||
900 | help | ||
901 | If you say yes here you get hardware monitoring support for Maxim | ||
902 | MAX8688. | ||
903 | |||
904 | This driver can also be built as a module. If so, the module will | ||
905 | be called max8688. | ||
906 | |||
907 | config SENSORS_UCD9000 | ||
908 | tristate "TI UCD90120, UCD90124, UCD9090, UCD90910" | ||
909 | default n | ||
910 | help | ||
911 | If you say yes here you get hardware monitoring support for TI | ||
912 | UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health | ||
913 | Controllers. | ||
914 | |||
915 | This driver can also be built as a module. If so, the module will | ||
916 | be called ucd9000. | ||
917 | |||
918 | config SENSORS_UCD9200 | ||
919 | tristate "TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, UCD9248" | ||
920 | default n | ||
921 | help | ||
922 | If you say yes here you get hardware monitoring support for TI | ||
923 | UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248 | ||
924 | Digital PWM System Controllers. | ||
925 | |||
926 | This driver can also be built as a module. If so, the module will | ||
927 | be called ucd9200. | ||
928 | |||
929 | endif # PMBUS | ||
930 | 845 | ||
931 | config SENSORS_SHT15 | 846 | config SENSORS_SHT15 |
932 | tristate "Sensiron humidity and temperature sensors. SHT15 and compat." | 847 | tristate "Sensiron humidity and temperature sensors. SHT15 and compat." |
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 9a4473993845..4f1e394bb127 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
@@ -122,15 +122,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o | |||
122 | obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o | 122 | obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o |
123 | obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o | 123 | obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o |
124 | 124 | ||
125 | # PMBus drivers | 125 | obj-$(CONFIG_PMBUS) += pmbus/ |
126 | obj-$(CONFIG_PMBUS) += pmbus_core.o | ||
127 | obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o | ||
128 | obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o | ||
129 | obj-$(CONFIG_SENSORS_MAX16064) += max16064.o | ||
130 | obj-$(CONFIG_SENSORS_MAX34440) += max34440.o | ||
131 | obj-$(CONFIG_SENSORS_MAX8688) += max8688.o | ||
132 | obj-$(CONFIG_SENSORS_UCD9000) += ucd9000.o | ||
133 | obj-$(CONFIG_SENSORS_UCD9200) += ucd9200.o | ||
134 | 126 | ||
135 | ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG | 127 | ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG |
136 | 128 | ||
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig new file mode 100644 index 000000000000..794129f48594 --- /dev/null +++ b/drivers/hwmon/pmbus/Kconfig | |||
@@ -0,0 +1,90 @@ | |||
1 | # | ||
2 | # PMBus chip drivers configuration | ||
3 | # | ||
4 | |||
5 | menuconfig PMBUS | ||
6 | tristate "PMBus support" | ||
7 | depends on I2C && EXPERIMENTAL | ||
8 | default n | ||
9 | help | ||
10 | Say yes here if you want to enable PMBus support. | ||
11 | |||
12 | This driver can also be built as a module. If so, the module will | ||
13 | be called pmbus_core. | ||
14 | |||
15 | if PMBUS | ||
16 | |||
17 | config SENSORS_PMBUS | ||
18 | tristate "Generic PMBus devices" | ||
19 | default y | ||
20 | help | ||
21 | If you say yes here you get hardware monitoring support for generic | ||
22 | PMBus devices, including but not limited to BMR450, BMR451, BMR453, | ||
23 | BMR454, and LTC2978. | ||
24 | |||
25 | This driver can also be built as a module. If so, the module will | ||
26 | be called pmbus. | ||
27 | |||
28 | config SENSORS_ADM1275 | ||
29 | tristate "Analog Devices ADM1275" | ||
30 | default n | ||
31 | help | ||
32 | If you say yes here you get hardware monitoring support for Analog | ||
33 | Devices ADM1275 Hot-Swap Controller and Digital Power Monitor. | ||
34 | |||
35 | This driver can also be built as a module. If so, the module will | ||
36 | be called adm1275. | ||
37 | |||
38 | config SENSORS_MAX16064 | ||
39 | tristate "Maxim MAX16064" | ||
40 | default n | ||
41 | help | ||
42 | If you say yes here you get hardware monitoring support for Maxim | ||
43 | MAX16064. | ||
44 | |||
45 | This driver can also be built as a module. If so, the module will | ||
46 | be called max16064. | ||
47 | |||
48 | config SENSORS_MAX34440 | ||
49 | tristate "Maxim MAX34440/MAX34441" | ||
50 | default n | ||
51 | help | ||
52 | If you say yes here you get hardware monitoring support for Maxim | ||
53 | MAX34440 and MAX34441. | ||
54 | |||
55 | This driver can also be built as a module. If so, the module will | ||
56 | be called max34440. | ||
57 | |||
58 | config SENSORS_MAX8688 | ||
59 | tristate "Maxim MAX8688" | ||
60 | default n | ||
61 | help | ||
62 | If you say yes here you get hardware monitoring support for Maxim | ||
63 | MAX8688. | ||
64 | |||
65 | This driver can also be built as a module. If so, the module will | ||
66 | be called max8688. | ||
67 | |||
68 | config SENSORS_UCD9000 | ||
69 | tristate "TI UCD90120, UCD90124, UCD9090, UCD90910" | ||
70 | default n | ||
71 | help | ||
72 | If you say yes here you get hardware monitoring support for TI | ||
73 | UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health | ||
74 | Controllers. | ||
75 | |||
76 | This driver can also be built as a module. If so, the module will | ||
77 | be called ucd9000. | ||
78 | |||
79 | config SENSORS_UCD9200 | ||
80 | tristate "TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, UCD9248" | ||
81 | default n | ||
82 | help | ||
83 | If you say yes here you get hardware monitoring support for TI | ||
84 | UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248 | ||
85 | Digital PWM System Controllers. | ||
86 | |||
87 | This driver can also be built as a module. If so, the module will | ||
88 | be called ucd9200. | ||
89 | |||
90 | endif # PMBUS | ||
diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile new file mode 100644 index 000000000000..0178f81829d0 --- /dev/null +++ b/drivers/hwmon/pmbus/Makefile | |||
@@ -0,0 +1,12 @@ | |||
1 | # | ||
2 | # Makefile for PMBus chip drivers. | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_PMBUS) += pmbus_core.o | ||
6 | obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o | ||
7 | obj-$(CONFIG_SENSORS_ADM1275) += adm1275.o | ||
8 | obj-$(CONFIG_SENSORS_MAX16064) += max16064.o | ||
9 | obj-$(CONFIG_SENSORS_MAX34440) += max34440.o | ||
10 | obj-$(CONFIG_SENSORS_MAX8688) += max8688.o | ||
11 | obj-$(CONFIG_SENSORS_UCD9000) += ucd9000.o | ||
12 | obj-$(CONFIG_SENSORS_UCD9200) += ucd9200.o | ||
diff --git a/drivers/hwmon/adm1275.c b/drivers/hwmon/pmbus/adm1275.c index 8bc1bd663721..8bc1bd663721 100644 --- a/drivers/hwmon/adm1275.c +++ b/drivers/hwmon/pmbus/adm1275.c | |||
diff --git a/drivers/hwmon/max16064.c b/drivers/hwmon/pmbus/max16064.c index 1d6d717060d3..1d6d717060d3 100644 --- a/drivers/hwmon/max16064.c +++ b/drivers/hwmon/pmbus/max16064.c | |||
diff --git a/drivers/hwmon/max34440.c b/drivers/hwmon/pmbus/max34440.c index db11e1a175b2..db11e1a175b2 100644 --- a/drivers/hwmon/max34440.c +++ b/drivers/hwmon/pmbus/max34440.c | |||
diff --git a/drivers/hwmon/max8688.c b/drivers/hwmon/pmbus/max8688.c index 7fb93f4e9f21..7fb93f4e9f21 100644 --- a/drivers/hwmon/max8688.c +++ b/drivers/hwmon/pmbus/max8688.c | |||
diff --git a/drivers/hwmon/pmbus.c b/drivers/hwmon/pmbus/pmbus.c index 9b1f0c37ef77..9b1f0c37ef77 100644 --- a/drivers/hwmon/pmbus.c +++ b/drivers/hwmon/pmbus/pmbus.c | |||
diff --git a/drivers/hwmon/pmbus.h b/drivers/hwmon/pmbus/pmbus.h index 50647ab7235a..50647ab7235a 100644 --- a/drivers/hwmon/pmbus.h +++ b/drivers/hwmon/pmbus/pmbus.h | |||
diff --git a/drivers/hwmon/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 8e31a8e2c746..8e31a8e2c746 100644 --- a/drivers/hwmon/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c | |||
diff --git a/drivers/hwmon/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c index ace1c7319734..ace1c7319734 100644 --- a/drivers/hwmon/ucd9000.c +++ b/drivers/hwmon/pmbus/ucd9000.c | |||
diff --git a/drivers/hwmon/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c index ffcc1cf3609d..ffcc1cf3609d 100644 --- a/drivers/hwmon/ucd9200.c +++ b/drivers/hwmon/pmbus/ucd9200.c | |||