diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-15 17:49:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-15 17:49:46 -0700 |
| commit | bbe05e543bfeab1c37127f38b7e575db916fbc6c (patch) | |
| tree | 30c8f1dc6465e6a5b31f51f4468cd7e7114dcde3 /MAINTAINERS | |
| parent | 9db59599ae502b38b27cff6462273f84acd59927 (diff) | |
| parent | aeb068c57214858b638d5ee627bb4a831f98771e (diff) | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull more i2c updates from Wolfram Sang:
"I2C has two more new drivers: Altera FPGA and STM32F7"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: i2c-stm32f7: add driver
i2c: i2c-stm32f4: use generic definition of speed enum
dt-bindings: i2c-stm32: Document the STM32F7 I2C bindings
i2c: altera: Add Altera I2C Controller driver
dt-bindings: i2c: Add Altera I2C Controller
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 209306019483..4b914dd27bae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -644,6 +644,11 @@ ALPS PS/2 TOUCHPAD DRIVER R: Pali Rohár <pali.rohar@gmail.com> F: drivers/input/mouse/alps.* +ALTERA I2C CONTROLLER DRIVER +M: Thor Thayer <thor.thayer@linux.intel.com> +S: Maintained +F: drivers/i2c/busses/i2c-altera.c + ALTERA MAILBOX DRIVER M: Ley Foon Tan <lftan@altera.com> L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) |