Skip to content

Commit

Permalink
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Jun 2, 2018
2 parents 0938a8f + a0ccb6b commit a36b796
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-ocores
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>

Expand Down
8 changes: 8 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -15513,6 +15513,14 @@ L: [email protected]
S: Supported
F: drivers/char/xillybus/

XLP9XX I2C DRIVER
M: George Cherian <[email protected]>
M: Jan Glauber <[email protected]>
L: [email protected]
W: http://www.cavium.com
S: Supported
F: drivers/i2c/busses/i2c-xlp9xx.c

XRA1403 GPIO EXPANDER
M: Nandor Han <[email protected]>
M: Semi Malinen <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-ocores.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* 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 <[email protected]>
*
Expand Down

0 comments on commit a36b796

Please sign in to comment.