Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a2fc18 authored Mar 28, 2012 by Linus Torvalds

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull i2c updates from Jean Delvare.

Fix up trivial conflict in drivers/i2c/busses/i2c-gpio.c due to include
file cleanup clashing with DT support addition (which did the same
cleanup)

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-algo-bit: Don't resched on clock stretching
  i2c: Update the FSF address
  i2c: Convert drivers/i2c/muxes/* to use module_i2c_driver()
  i2c-i801: Use usleep_range to wait for command completion
  i2c-i801: Add device IDs for Intel Lynx Point
  i2c-isch: Decrease delay in command completion check loop
  i2c-gpio: Use linux/gpio.h rather than asm/gpio.h

parents 7bf97e1d 41101a33

Documentation/i2c/busses/i2c-i801

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ Supported adapters:
	* Intel Patsburg (PCH)		* Intel Patsburg (PCH)
	* Intel DH89xxCC (PCH)		* Intel DH89xxCC (PCH)
	* Intel Panther Point (PCH)		* Intel Panther Point (PCH)
			* Intel Lynx Point (PCH)
	Datasheets: Publicly available at the Intel website		Datasheets: Publicly available at the Intel website

	On Intel Patsburg and later chipsets, both the normal host SMBus controller		On Intel Patsburg and later chipsets, both the normal host SMBus controller

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,8 @@

	You should have received a copy of the GNU General Public License		You should have received a copy of the GNU General Public License
	along with this program; if not, write to the Free Software		along with this program; if not, write to the Free Software
	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
			MA 02110-1301 USA.
	* ------------------------------------------------------------------------- */		* ------------------------------------------------------------------------- */

	/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki		/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
	@@ -111,7 +112,7 @@ static int sclhi(struct i2c_algo_bit_data *adap)
	break;		break;
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	cond_resched();		cpu_relax();
	}		}
	#ifdef DEBUG		#ifdef DEBUG
	if (jiffies != start && i2c_debug >= 3)		if (jiffies != start && i2c_debug >= 3)

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,8 @@
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
			* MA 02110-1301 USA.
	*/		*/

	#include <linux/kernel.h>		#include <linux/kernel.h>

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,8 @@
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
			* MA 02110-1301 USA.
	*		*
	* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and		* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
	* Frodo Looijaard <frodol@dds.nl>, and also from Martin Bailey		* Frodo Looijaard <frodol@dds.nl>, and also from Martin Bailey

drivers/i2c/algos/i2c-algo-pcf.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,8 @@

	You should have received a copy of the GNU General Public License		You should have received a copy of the GNU General Public License
	along with this program; if not, write to the Free Software		along with this program; if not, write to the Free Software
	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */		Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
			MA 02110-1301 USA. */
	/* -------------------------------------------------------------------- */		/* -------------------------------------------------------------------- */

	/* With some changes from Frodo Looijaard <frodol@dds.nl> */		/* With some changes from Frodo Looijaard <frodol@dds.nl> */