diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 10:20:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 10:20:47 -0800 |
| commit | 496659003dac5d08ea292c44fce9dfb36fa34691 (patch) | |
| tree | a94fd76e161b38f4ed96fbbbe8b8ff05f0ed9c70 | |
| parent | f3d8b0ebaec4e755317e2e8b863a4004d6505288 (diff) | |
| parent | f85478fb3fecad01927935c51fe7e9dd5731d0b7 (diff) | |
Merge tag 'i2c-for-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"MAINTAINERS maintenance.
Changed email, added entry, deleted entry falling back to a generic
one"
* tag 'i2c-for-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: Add maintainer for Qualcomm's I2C GENI driver
MAINTAINERS: delete entry for AXXIA I2C
MAINTAINERS: Use my kernel.org address for I2C ACPI work
| -rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 10893c91b1c1..f9228f9b7d53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3858,13 +3858,6 @@ W: https://ez.analog.com/linux-software-drivers F: Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml F: drivers/pwm/pwm-axi-pwmgen.c -AXXIA I2C CONTROLLER -M: Krzysztof Adamski <krzysztof.adamski@nokia.com> -L: linux-i2c@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/i2c/i2c-axxia.txt -F: drivers/i2c/busses/i2c-axxia.c - AZ6007 DVB DRIVER M: Mauro Carvalho Chehab <mchehab@kernel.org> L: linux-media@vger.kernel.org @@ -10821,7 +10814,7 @@ S: Odd Fixes F: drivers/tty/hvc/ I2C ACPI SUPPORT -M: Mika Westerberg <mika.westerberg@linux.intel.com> +M: Mika Westerberg <westeri@kernel.org> L: linux-i2c@vger.kernel.org L: linux-acpi@vger.kernel.org S: Maintained @@ -19508,6 +19501,15 @@ L: dmaengine@vger.kernel.org S: Supported F: drivers/dma/qcom/hidma* +QUALCOMM I2C QCOM GENI DRIVER +M: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> +M: Viken Dadhaniya <quic_vdadhani@quicinc.com> +L: linux-i2c@vger.kernel.org +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml +F: drivers/i2c/busses/i2c-qcom-geni.c + QUALCOMM I2C CCI DRIVER M: Loic Poulain <loic.poulain@linaro.org> M: Robert Foss <rfoss@kernel.org> |