14 files changed, 115 insertions, 95 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ccf1feb07ab2..1841eb7e1ede 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4968,6 +4968,17 @@ F:	drivers/i2c/busses/i2c-puv3.c
 F:      drivers/video/fb-puv3.c
 F:      drivers/rtc/rtc-puv3.c
 
+PMBUS HARDWARE MONITORING DRIVERS
+M:      Guenter Roeck <guenter.roeck@ericsson.com>
+L:      lm-sensors@lm-sensors.org
+W:      http://www.lm-sensors.org/
+W:      http://www.roeck-us.net/linux/drivers/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
+S:      Maintained
+F:      Documentation/hwmon/pmbus
+F:      drivers/hwmon/pmbus/
+F:      include/linux/i2c/pmbus.h
+
 PMC SIERRA MaxRAID DRIVER
 M:      Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:      linux-scsi@vger.kernel.org
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
           These devices are hard to detect and rarely found on mainstream
           hardware.  If unsure, say N.
 
-config PMBUS
-        tristate "PMBus support"
-        depends on I2C && EXPERIMENTAL
-        default n
-        help
-          Say yes here if you want to enable PMBus support.
-
-          This driver can also be built as a module. If so, the module will
-          be called pmbus_core.
-
-if PMBUS
-
-config SENSORS_PMBUS
-        tristate "Generic PMBus devices"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for generic
-          PMBus devices, including but not limited to BMR450, BMR451, BMR453,
-          BMR454, and LTC2978.
-
-          This driver can also be built as a module. If so, the module will
-          be called pmbus.
-
-config SENSORS_ADM1275
-        tristate "Analog Devices ADM1275"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Analog
-          Devices ADM1275 Hot-Swap Controller and Digital Power Monitor.
-
-          This driver can also be built as a module. If so, the module will
-          be called adm1275.
-
-config SENSORS_MAX16064
-        tristate "Maxim MAX16064"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX16064.
-
-          This driver can also be built as a module. If so, the module will
-          be called max16064.
-
-config SENSORS_MAX34440
-        tristate "Maxim MAX34440/MAX34441"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX34440 and MAX34441.
-
-          This driver can also be built as a module. If so, the module will
-          be called max34440.
-
-config SENSORS_MAX8688
-        tristate "Maxim MAX8688"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for Maxim
-          MAX8688.
-
-          This driver can also be built as a module. If so, the module will
-          be called max8688.
-
-config SENSORS_UCD9000
-        tristate "TI UCD90120, UCD90124, UCD9090, UCD90910"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for TI
-          UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health
-          Controllers.
-
-          This driver can also be built as a module. If so, the module will
-          be called ucd9000.
-
-config SENSORS_UCD9200
-        tristate "TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, UCD9248"
-        default n
-        help
-          If you say yes here you get hardware monitoring support for TI
-          UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248
-          Digital PWM System Controllers.
-
-          This driver can also be built as a module. If so, the module will
-          be called ucd9200.
-
-endif # PMBUS
+source drivers/hwmon/pmbus/Kconfig
 
 config SENSORS_SHT15
         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
 obj-$(CONFIG_SENSORS_WM831X)    += wm831x-hwmon.o
 obj-$(CONFIG_SENSORS_WM8350)    += wm8350-hwmon.o
 
-# PMBus drivers
-obj-$(CONFIG_PMBUS)             += pmbus_core.o
-obj-$(CONFIG_SENSORS_PMBUS)     += pmbus.o
-obj-$(CONFIG_SENSORS_ADM1275)   += adm1275.o
-obj-$(CONFIG_SENSORS_MAX16064)  += max16064.o
-obj-$(CONFIG_SENSORS_MAX34440)  += max34440.o
-obj-$(CONFIG_SENSORS_MAX8688)   += max8688.o
-obj-$(CONFIG_SENSORS_UCD9000)   += ucd9000.o
-obj-$(CONFIG_SENSORS_UCD9200)   += ucd9200.o
+obj-$(CONFIG_PMBUS)             += pmbus/
 
 ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
 
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 @@
+#
+# PMBus chip drivers configuration
+#
+
+menuconfig PMBUS
+        tristate "PMBus support"
+        depends on I2C && EXPERIMENTAL
+        default n
+        help
+          Say yes here if you want to enable PMBus support.
+
+          This driver can also be built as a module. If so, the module will
+          be called pmbus_core.
+
+if PMBUS
+
+config SENSORS_PMBUS
+        tristate "Generic PMBus devices"
+        default y
+        help
+          If you say yes here you get hardware monitoring support for generic
+          PMBus devices, including but not limited to BMR450, BMR451, BMR453,
+          BMR454, and LTC2978.
+
+          This driver can also be built as a module. If so, the module will
+          be called pmbus.
+
+config SENSORS_ADM1275
+        tristate "Analog Devices ADM1275"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for Analog
+          Devices ADM1275 Hot-Swap Controller and Digital Power Monitor.
+
+          This driver can also be built as a module. If so, the module will
+          be called adm1275.
+
+config SENSORS_MAX16064
+        tristate "Maxim MAX16064"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for Maxim
+          MAX16064.
+
+          This driver can also be built as a module. If so, the module will
+          be called max16064.
+
+config SENSORS_MAX34440
+        tristate "Maxim MAX34440/MAX34441"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for Maxim
+          MAX34440 and MAX34441.
+
+          This driver can also be built as a module. If so, the module will
+          be called max34440.
+
+config SENSORS_MAX8688
+        tristate "Maxim MAX8688"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for Maxim
+          MAX8688.
+
+          This driver can also be built as a module. If so, the module will
+          be called max8688.
+
+config SENSORS_UCD9000
+        tristate "TI UCD90120, UCD90124, UCD9090, UCD90910"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for TI
+          UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health
+          Controllers.
+
+          This driver can also be built as a module. If so, the module will
+          be called ucd9000.
+
+config SENSORS_UCD9200
+        tristate "TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, UCD9248"
+        default n
+        help
+          If you say yes here you get hardware monitoring support for TI
+          UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248
+          Digital PWM System Controllers.
+
+          This driver can also be built as a module. If so, the module will
+          be called ucd9200.
+
+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 @@
+#
+# Makefile for PMBus chip drivers.
+#
+
+obj-$(CONFIG_PMBUS)             += pmbus_core.o
+obj-$(CONFIG_SENSORS_PMBUS)     += pmbus.o
+obj-$(CONFIG_SENSORS_ADM1275)   += adm1275.o
+obj-$(CONFIG_SENSORS_MAX16064)  += max16064.o
+obj-$(CONFIG_SENSORS_MAX34440)  += max34440.o
+obj-$(CONFIG_SENSORS_MAX8688)   += max8688.o
+obj-$(CONFIG_SENSORS_UCD9000)   += ucd9000.o
+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