diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-19 11:52:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-19 11:52:24 -0700 |
| commit | 03fb3acae4be8a6b680ffedb220a8b6c07260b40 (patch) | |
| tree | 7ade9bc8ea4bbb9d272b641aff625fce34f19973 /MAINTAINERS | |
| parent | 97076ea41a093e67db20d0e40f728a054b799630 (diff) | |
| parent | efa7fb4c6c8e4171fd29a5935a9dc7a28e363278 (diff) | |
| download | linux-03fb3acae4be8a6b680ffedb220a8b6c07260b40.tar.bz2 | |
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A set of driver and core fixes as well as MAINTAINER update"
* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add maintainer for mediatek i2c controller driver
i2c: mux: Replace zero-length array with flexible-array
i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
i2c: altera: Fix race between xfer_msg and isr thread
i2c: algo-pca: update contact email
i2c: at91: Fix pinmux after devm_gpiod_get() for bus recovery
i2c: use my kernel.org address from now on
i2c: fix missing pm_runtime_put_sync in i2c_device_probe
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ecc0749810b0..7b58ca29cc80 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7941,7 +7941,7 @@ F: Documentation/i2c/busses/i2c-parport.rst F: drivers/i2c/busses/i2c-parport.c I2C SUBSYSTEM -M: Wolfram Sang <wsa@the-dreams.de> +M: Wolfram Sang <wsa@kernel.org> L: linux-i2c@vger.kernel.org S: Maintained W: https://i2c.wiki.kernel.org/ @@ -10662,6 +10662,13 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/mediatek/ +MEDIATEK I2C CONTROLLER DRIVER +M: Qii Wang <qii.wang@mediatek.com> +L: linux-i2c@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt +F: drivers/i2c/busses/i2c-mt65xx.c + MEDIATEK JPEG DRIVER M: Rick Chang <rick.chang@mediatek.com> M: Bin Liu <bin.liu@mediatek.com> |