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

Commit a36b7968 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "A documentation bugfix and a MAINTAINERS addition"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: ocores: update HDL sources URL
  i2c: xlp9xx: Add MAINTAINERS entry
parents 0938a8f5 a0ccb6b5

Documentation/i2c/busses/i2c-ocores

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Kernel driver i2c-ocores 


Supported adapters:

  * OpenCores.org I2C controller by Richard Herveille (see datasheet link)

    Datasheet: http://www.opencores.org/projects.cgi/web/i2c/overview

    https://opencores.org/project/i2c/overview



Author: Peter Korsgaard <jacmet@sunsite.dk>

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -15513,6 +15513,14 @@ L: linux-kernel@vger.kernel.org 
S:	Supported

F:	drivers/char/xillybus/



XLP9XX I2C DRIVER

M:	George Cherian <george.cherian@cavium.com>

M:	Jan Glauber <jglauber@cavium.com>

L:	linux-i2c@vger.kernel.org

W:	http://www.cavium.com

S:	Supported

F:	drivers/i2c/busses/i2c-xlp9xx.c



XRA1403 GPIO EXPANDER

M:	Nandor Han <nandor.han@ge.com>

M:	Semi Malinen <semi.malinen@ge.com>

drivers/i2c/busses/i2c-ocores.c

+1 −1
Original line number Diff line number Diff line 
/*

 * i2c-ocores.c: I2C bus driver for OpenCores I2C controller

 * (http://www.opencores.org/projects.cgi/web/i2c/overview).

 * (https://opencores.org/project/i2c/overview)

 *

 * Peter Korsgaard <jacmet@sunsite.dk>

 *