Commit 50115ac9 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (pmbus/max34440) Add support for MAX34460 and MAX34461 



MAX34460 is a PMBus 12-Channel Voltage Monitor & Sequencer.
MAX34461 is a PMBus 16-Channel Voltage Monitor & Sequencer.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 16c6d01f

Documentation/hwmon/max34440

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ Supported chips: 
    Prefixes: 'max34446'

    Addresses scanned: -

    Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34446.pdf

  * Maxim MAX34460

    PMBus 12-Channel Voltage Monitor & Sequencer

    Prefix: 'max34460'

    Addresses scanned: -

    Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34460.pdf

  * Maxim MAX34461

    PMBus 16-Channel Voltage Monitor & Sequencer

    Prefix: 'max34461'

    Addresses scanned: -

    Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf



Author: Guenter Roeck <guenter.roeck@ericsson.com>
@@ -26,6 +36,9 @@ Description 
This driver supports hardware montoring for Maxim MAX34440 PMBus 6-Channel

Power-Supply Manager, MAX34441 PMBus 5-Channel Power-Supply Manager

and Intelligent Fan Controller, and MAX34446 PMBus Power-Supply Data Logger.

It also supports the MAX34460 and MAX34461 PMBus Voltage Monitor & Sequencers.

The MAX34460 supports 12 voltage channels, and the MAX34461 supports 16 voltage

channels.



The driver is a client driver to the core PMBus driver. Please see

Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -109,3 +122,6 @@ temp[1-8]_reset_history Write any value to reset history. 


			temp7 and temp8 attributes only exist for MAX34440.

			MAX34446 only supports temp[1-3].



MAX34460 supports attribute groups in[1-12] and temp[1-5].

MAX34461 supports attribute groups in[1-16] and temp[1-5].

drivers/hwmon/pmbus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ config SENSORS_MAX34440 
	default n

	help

	  If you say yes here you get hardware monitoring support for Maxim

	  MAX34440, MAX34441, and MAX34446.

	  MAX34440, MAX34441, MAX34446, MAX34460, and MAX34461.



	  This driver can also be built as a module. If so, the module will

	  be called max34440.

drivers/hwmon/pmbus/max34440.c

+73 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Hardware monitoring driver for Maxim MAX34440/MAX34441

 *

 * Copyright (c) 2011 Ericsson AB.

 * Copyright (c) 2012 Guenter Roeck

 *

 * 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
@@ -25,7 +26,7 @@ 
#include <linux/i2c.h>

#include "pmbus.h"



enum chips { max34440, max34441, max34446 };

enum chips { max34440, max34441, max34446, max34460, max34461 };



#define MAX34440_MFR_VOUT_PEAK		0xd4

#define MAX34440_MFR_IOUT_PEAK		0xd5
@@ -87,7 +88,8 @@ static int max34440_read_word_data(struct i2c_client *client, int page, int reg) 
					   MAX34446_MFR_POUT_PEAK);

		break;

	case PMBUS_VIRT_READ_TEMP_AVG:

		if (data->id != max34446)

		if (data->id != max34446 && data->id != max34460 &&

		    data->id != max34461)

			return -ENXIO;

		ret = pmbus_read_word_data(client, page,

					   MAX34446_MFR_TEMPERATURE_AVG);
@@ -322,6 +324,73 @@ static struct pmbus_driver_info max34440_info[] = { 
		.read_word_data = max34440_read_word_data,

		.write_word_data = max34440_write_word_data,

	},

	[max34460] = {

		.pages = 18,

		.format[PSC_VOLTAGE_OUT] = direct,

		.format[PSC_TEMPERATURE] = direct,

		.m[PSC_VOLTAGE_OUT] = 1,

		.b[PSC_VOLTAGE_OUT] = 0,

		.R[PSC_VOLTAGE_OUT] = 3,

		.m[PSC_TEMPERATURE] = 1,

		.b[PSC_TEMPERATURE] = 0,

		.R[PSC_TEMPERATURE] = 2,

		.func[0] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[2] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[3] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[4] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[5] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[6] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[7] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[8] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[9] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[10] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[11] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[13] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[14] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[15] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[16] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[17] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.read_byte_data = max34440_read_byte_data,

		.read_word_data = max34440_read_word_data,

		.write_word_data = max34440_write_word_data,

	},

	[max34461] = {

		.pages = 23,

		.format[PSC_VOLTAGE_OUT] = direct,

		.format[PSC_TEMPERATURE] = direct,

		.m[PSC_VOLTAGE_OUT] = 1,

		.b[PSC_VOLTAGE_OUT] = 0,

		.R[PSC_VOLTAGE_OUT] = 3,

		.m[PSC_TEMPERATURE] = 1,

		.b[PSC_TEMPERATURE] = 0,

		.R[PSC_TEMPERATURE] = 2,

		.func[0] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[2] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[3] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[4] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[5] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[6] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[7] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[8] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[9] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[10] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[11] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[12] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[13] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[14] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		.func[15] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT,

		/* page 16 is reserved */

		.func[17] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[18] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[19] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[20] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.func[21] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,

		.read_byte_data = max34440_read_byte_data,

		.read_word_data = max34440_read_word_data,

		.write_word_data = max34440_write_word_data,

	},

};



static int max34440_probe(struct i2c_client *client,
@@ -343,6 +412,8 @@ static const struct i2c_device_id max34440_id[] = { 
	{"max34440", max34440},

	{"max34441", max34441},

	{"max34446", max34446},

	{"max34460", max34460},

	{"max34461", max34461},

	{}

};

MODULE_DEVICE_TABLE(i2c, max34440_id);