Skip to content

Commit 4966590

Browse files
committed
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
2 parents f3d8b0e + f85478f commit 4966590

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

MAINTAINERS

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3858,13 +3858,6 @@ W: https://ez.analog.com/linux-software-drivers
38583858
F: Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml
38593859
F: drivers/pwm/pwm-axi-pwmgen.c
38603860

3861-
AXXIA I2C CONTROLLER
3862-
M: Krzysztof Adamski <krzysztof.adamski@nokia.com>
3863-
L: linux-i2c@vger.kernel.org
3864-
S: Maintained
3865-
F: Documentation/devicetree/bindings/i2c/i2c-axxia.txt
3866-
F: drivers/i2c/busses/i2c-axxia.c
3867-
38683861
AZ6007 DVB DRIVER
38693862
M: Mauro Carvalho Chehab <mchehab@kernel.org>
38703863
L: linux-media@vger.kernel.org
@@ -10821,7 +10814,7 @@ S: Odd Fixes
1082110814
F: drivers/tty/hvc/
1082210815

1082310816
I2C ACPI SUPPORT
10824-
M: Mika Westerberg <mika.westerberg@linux.intel.com>
10817+
M: Mika Westerberg <westeri@kernel.org>
1082510818
L: linux-i2c@vger.kernel.org
1082610819
L: linux-acpi@vger.kernel.org
1082710820
S: Maintained
@@ -19508,6 +19501,15 @@ L: dmaengine@vger.kernel.org
1950819501
S: Supported
1950919502
F: drivers/dma/qcom/hidma*
1951019503

19504+
QUALCOMM I2C QCOM GENI DRIVER
19505+
M: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>
19506+
M: Viken Dadhaniya <quic_vdadhani@quicinc.com>
19507+
L: linux-i2c@vger.kernel.org
19508+
L: linux-arm-msm@vger.kernel.org
19509+
S: Maintained
19510+
F: Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml
19511+
F: drivers/i2c/busses/i2c-qcom-geni.c
19512+
1951119513
QUALCOMM I2C CCI DRIVER
1951219514
M: Loic Poulain <loic.poulain@linaro.org>
1951319515
M: Robert Foss <rfoss@kernel.org>

0 commit comments

Comments
 (0)