Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (8adbf8d4) · Commits · 戴 / test

Documentation/i2c/muxes/gpio-i2cmux

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		Kernel driver gpio-i2cmux

		Author: Peter Korsgaard <peter.korsgaard@barco.com>

		Description
		-----------

		gpio-i2cmux is an i2c mux driver providing access to I2C bus segments
		from a master I2C bus and a hardware MUX controlled through GPIO pins.

		E.G.:

		---------- ---------- Bus segment 1 - - - - -
		\| \| SCL/SDA \| \|-------------- \| \|
		\| \|------------\| \|
		\| \| \| \| Bus segment 2 \| \|
		\| Linux \| GPIO 1..N \| MUX \|--------------- Devices
		\| \|------------\| \| \| \|
		\| \| \| \| Bus segment M
		\| \| \| \|---------------\| \|
		---------- ---------- - - - - -

		SCL/SDA of the master I2C bus is multiplexed to bus segment 1..M
		according to the settings of the GPIO pins 1..N.

		Usage
		-----

		gpio-i2cmux uses the platform bus, so you need to provide a struct
		platform_device with the platform_data pointing to a struct
		gpio_i2cmux_platform_data with the I2C adapter number of the master
		bus, the number of bus segments to create and the GPIO pins used
		to control it. See include/linux/gpio-i2cmux.h for details.

		E.G. something like this for a MUX providing 4 bus segments
		controlled through 3 GPIO pins:

		#include <linux/gpio-i2cmux.h>
		#include <linux/platform_device.h>

		static const unsigned myboard_gpiomux_gpios[] = {
		AT91_PIN_PC26, AT91_PIN_PC25, AT91_PIN_PC24
		};

		static const unsigned myboard_gpiomux_values[] = {
		0, 1, 2, 3
		};

		static struct gpio_i2cmux_platform_data myboard_i2cmux_data = {
		.parent = 1,
		.base_nr = 2, /* optional */
		.values = myboard_gpiomux_values,
		.n_values = ARRAY_SIZE(myboard_gpiomux_values),
		.gpios = myboard_gpiomux_gpios,
		.n_gpios = ARRAY_SIZE(myboard_gpiomux_gpios),
		.idle = 4, /* optional */
		};

		static struct platform_device myboard_i2cmux = {
		.name = "gpio-i2cmux",
		.id = 0,
		.dev = {
		.platform_data = &myboard_i2cmux_data,
		},
		};

MAINTAINERS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2692,6 +2692,14 @@ S: Supported
		F: drivers/i2c/busses/i2c-gpio.c
		F: include/linux/i2c-gpio.h

		GENERIC GPIO I2C MULTIPLEXER DRIVER
		M: Peter Korsgaard <peter.korsgaard@barco.com>
		L: linux-i2c@vger.kernel.org
		S: Supported
		F: drivers/i2c/muxes/gpio-i2cmux.c
		F: include/linux/gpio-i2cmux.h
		F: Documentation/i2c/muxes/gpio-i2cmux

		GENERIC HDLC (WAN) DRIVERS
		M: Krzysztof Halasa <khc@pm.waw.pl>
		W: http://www.kernel.org/pub/linux/utils/net/hdlc/

drivers/i2c/algos/i2c-algo-bit.c

+15 −16

Original line number	Diff line number	Diff line
		@@ -600,12 +600,14 @@ static const struct i2c_algorithm i2c_bit_algo = {
		/*
		* registering functions to load algorithms at runtime
		*/
		static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
		static int __i2c_bit_add_bus(struct i2c_adapter *adap,
		int (add_adapter)(struct i2c_adapter ))
		{
		struct i2c_algo_bit_data *bit_adap = adap->algo_data;
		int ret;

		if (bit_test) {
		int ret = test_bus(bit_adap, adap->name);
		ret = test_bus(bit_adap, adap->name);
		if (ret < 0)
		return -ENODEV;
		}
		@@ -614,30 +616,27 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
		adap->algo = &i2c_bit_algo;
		adap->retries = 3;

		ret = add_adapter(adap);
		if (ret < 0)
		return ret;

		/* Complain if SCL can't be read */
		if (bit_adap->getscl == NULL) {
		dev_warn(&adap->dev, "Not I2C compliant: can't read SCL\n");
		dev_warn(&adap->dev, "Bus may be unreliable\n");
		}
		return 0;
		}

		int i2c_bit_add_bus(struct i2c_adapter *adap)
		{
		int err;

		err = i2c_bit_prepare_bus(adap);
		if (err)
		return err;

		return i2c_add_adapter(adap);
		return __i2c_bit_add_bus(adap, i2c_add_adapter);
		}
		EXPORT_SYMBOL(i2c_bit_add_bus);

		int i2c_bit_add_numbered_bus(struct i2c_adapter *adap)
		{
		int err;

		err = i2c_bit_prepare_bus(adap);
		if (err)
		return err;

		return i2c_add_numbered_adapter(adap);
		return __i2c_bit_add_bus(adap, i2c_add_numbered_adapter);
		}
		EXPORT_SYMBOL(i2c_bit_add_numbered_bus);

drivers/i2c/busses/i2c-i801.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@
		#include <linux/acpi.h>
		#include <linux/io.h>
		#include <linux/dmi.h>
		#include <linux/slab.h>

		/* I801 SMBus address offsets */
		#define SMBHSTSTS(p) (0 + (p)->smba)

drivers/i2c/busses/i2c-nforce2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_

		static void __devexit nforce2_remove(struct pci_dev *dev)
		{
		struct nforce2_smbus smbuses = (void) pci_get_drvdata(dev);
		struct nforce2_smbus *smbuses = pci_get_drvdata(dev);

		nforce2_set_reference(NULL);
		if (smbuses[0].base) {

Admin message