3 files changed, 132 insertions, 0 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index d00fd39f6ee3..4abd3735a76e 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -827,6 +827,16 @@ config SENSORS_PMBUS
           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
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index c4a269b06925..21c9b17abad5 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -120,6 +120,7 @@ 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
diff --git a/drivers/hwmon/adm1275.c b/drivers/hwmon/adm1275.c
new file mode 100644
index 000000000000..c2ee2048ab91
--- /dev/null
+++ b/drivers/hwmon/adm1275.c
@@ -0,0 +1,121 @@
+/*
+ * Hardware monitoring driver for Analog Devices ADM1275 Hot-Swap Controller
+ * and Digital Power Monitor
+ *
+ * Copyright (c) 2011 Ericsson AB.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include "pmbus.h"
+
+#define ADM1275_PMON_CONFIG             0xd4
+
+#define ADM1275_VIN_VOUT_SELECT         (1 << 6)
+#define ADM1275_VRANGE                  (1 << 5)
+
+static int adm1275_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        int config;
+        struct pmbus_driver_info *info;
+
+        if (!i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_READ_BYTE_DATA))
+                return -ENODEV;
+
+        info = kzalloc(sizeof(struct pmbus_driver_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
+        if (config < 0)
+                return config;
+
+        info->pages = 1;
+        info->direct[PSC_VOLTAGE_IN] = true;
+        info->direct[PSC_VOLTAGE_OUT] = true;
+        info->direct[PSC_CURRENT_OUT] = true;
+        info->m[PSC_CURRENT_OUT] = 800;
+        info->b[PSC_CURRENT_OUT] = 20475;
+        info->R[PSC_CURRENT_OUT] = -1;
+        info->func[0] = PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT;
+
+        if (config & ADM1275_VRANGE) {
+                info->m[PSC_VOLTAGE_IN] = 19045;
+                info->b[PSC_VOLTAGE_IN] = 0;
+                info->R[PSC_VOLTAGE_IN] = -2;
+                info->m[PSC_VOLTAGE_OUT] = 19045;
+                info->b[PSC_VOLTAGE_OUT] = 0;
+                info->R[PSC_VOLTAGE_OUT] = -2;
+        } else {
+                info->m[PSC_VOLTAGE_IN] = 6666;
+                info->b[PSC_VOLTAGE_IN] = 0;
+                info->R[PSC_VOLTAGE_IN] = -1;
+                info->m[PSC_VOLTAGE_OUT] = 6666;
+                info->b[PSC_VOLTAGE_OUT] = 0;
+                info->R[PSC_VOLTAGE_OUT] = -1;
+        }
+
+        if (config & ADM1275_VIN_VOUT_SELECT)
+                info->func[0] |= PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT;
+        else
+                info->func[0] |= PMBUS_HAVE_VIN | PMBUS_HAVE_STATUS_INPUT;
+
+        return pmbus_do_probe(client, id, info);
+}
+
+static int adm1275_remove(struct i2c_client *client)
+{
+        const struct pmbus_driver_info *info = pmbus_get_driver_info(client);
+        int ret;
+
+        ret = pmbus_do_remove(client);
+        kfree(info);
+        return ret;
+}
+
+static const struct i2c_device_id adm1275_id[] = {
+        {"adm1275", 0},
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, adm1275_id);
+
+static struct i2c_driver adm1275_driver = {
+        .driver = {
+                   .name = "adm1275",
+                   },
+        .probe = adm1275_probe,
+        .remove = adm1275_remove,
+        .id_table = adm1275_id,
+};
+
+static int __init adm1275_init(void)
+{
+        return i2c_add_driver(&adm1275_driver);
+}
+
+static void __exit adm1275_exit(void)
+{
+        i2c_del_driver(&adm1275_driver);
+}
+
+MODULE_AUTHOR("Guenter Roeck");
+MODULE_DESCRIPTION("PMBus driver for Analog Devices ADM1275");
+MODULE_LICENSE("GPL");
+module_init(adm1275_init);
+module_exit(adm1275_exit);