Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c-for-6.17-rc8 

MAINTAINERS: various updates
 riic: fix an off-by-one error
 k1: fix schema to allow validation
 rtl9300: fix faulty merge conflict resolution
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmjZgEIACgkQFA3kzBSg
 KbZPIw//X0zXdW+ZrIsT2FmJpXQtAyVReQ6whXGEvCaTb4RO0N9fgMrNvCMEL4od
 KSML7TjJqQpyCHf4hkwqMMnf8c9iyqP4Nf/QJwaJOjlyu56IYntnEr7XJ4T697Ex
 wCmD3XISuYb5f3GypC2byeE4Bk9gtSYPj4qczTHg50eu3LR5BGvljTforqeES3s4
 4SDd/oPQL0ilThRVa4V/pGWDevHI4jw5nN+ABWDn/AlY24lgKH5m6MsO1uXiWGrZ
 3OhlFkIbIZjKYlVjmR9nZAGtl4lPH54dA0Onw7uqHOKJiyYlEHWxGUmKWmUvWzCy
 DcYLGlffmbBHHpN+hhuW5XpXPqBVzSl6rkyQrNOrcFrZgo80NPwNhJDW6tIWjwvY
 YZBZbN3sVfapxrnGAVj6jTpRVVts7cptvUxHxB4yiWXxf5aGb8QlcLTWHWw6RXy7
 FOcvj81Jjr39zSzDfVzbTeBzpkZakQwQwhQKVZ8w1L0nnmR16PUdGLpbh5YtpS6i
 OjeC6hvq/VPdq0G25Oyv4Te1Ps0DKqNuKtfwIcIWpZImHpGFyCuCorwjatdVxbb9
 /risV5gqjwAMu39yRLOMAZZtem1i2c1FDodS20TiVRXByEvsRoT+qSq2z/K8whY/
 BvPPPJuol8p7IbamK0mYtzbb6uCcwR/QOi9exVGI8O9jBJyQeGk=
 =fKk4
 -----END PGP SIGNATURE-----

Merge tag 'i2c-for-6.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:

 - various MAINTAINERS updates

 - fix an off-by-one error in riic

 - fix k1 DT schema to allow validation

 - rtl9300: fix faulty merge conflict resolution

* tag 'i2c-for-6.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rtl9300: Drop unsupported I2C_FUNC_SMBUS_I2C_BLOCK
  MAINTAINERS: add entry for SpacemiT K1 I2C driver
  MAINTAINERS: Add me as maintainer of Synopsys DesignWare I2C driver
  MAINTAINERS: delete email for Tharun Kumar P
  dt-bindings: i2c: spacemit: extend and validate all properties
  i2c: riic: Allow setting frequencies lower than 50KHz
  MAINTAINERS: Remove myself as Synopsys DesignWare I2C maintainer
  MAINTAINERS: Update email address for Qualcomm's I2C GENI maintainers
This commit is contained in:
Linus Torvalds 2025-09-28 13:19:23 -07:00
parent 8f9736633f 0955305121
commit 6855f06042
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/i2c/spacemit,k1-i2c.yaml
View File

@ -9,6 +9,9 @@ title: I2C controller embedded in SpacemiT's K1 SoC
maintainers:
- Troy Mitchell <troymitchell988@gmail.com>
allOf:
- $ref: /schemas/i2c/i2c-controller.yaml#
properties:
compatible:
const: spacemit,k1-i2c

15
MAINTAINERS
View File

@ -16690,7 +16690,6 @@ F: drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
F: drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
MICROCHIP PCI1XXXX I2C DRIVER
M: Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
M: Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
L: linux-i2c@vger.kernel.org
@ -16699,7 +16698,6 @@ F: drivers/i2c/busses/i2c-mchp-pci1xxxx.c
MICROCHIP PCIe UART DRIVER
M: Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
M: Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
L: linux-serial@vger.kernel.org
S: Maintained
F: drivers/tty/serial/8250/8250_pci1xxxx.c
@ -20776,8 +20774,8 @@ 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>
M: Mukesh Kumar Savaliya <mukesh.savaliya@oss.qualcomm.com>
M: Viken Dadhaniya <viken.dadhaniya@oss.qualcomm.com>
L: linux-i2c@vger.kernel.org
L: linux-arm-msm@vger.kernel.org
S: Maintained
@ -23712,6 +23710,12 @@ W: https://linuxtv.org
Q: http://patchwork.linuxtv.org/project/linux-media/list/
F: drivers/media/dvb-frontends/sp2*
SPACEMIT K1 I2C DRIVER
M: Troy Mitchell <troy.mitchell@linux.spacemit.com>
S: Maintained
F: Documentation/devicetree/bindings/i2c/spacemit,k1-i2c.yaml
F: drivers/i2c/busses/i2c-k1.c
SPANISH DOCUMENTATION
M: Carlos Bilbao <carlos.bilbao@kernel.org>
R: Avadhut Naik <avadhut.naik@amd.com>
@ -24484,9 +24488,8 @@ F: Documentation/devicetree/bindings/media/snps,dw-hdmi-rx.yaml
F: drivers/media/platform/synopsys/hdmirx/*
SYNOPSYS DESIGNWARE I2C DRIVER
M: Jarkko Nikula <jarkko.nikula@linux.intel.com>
M: Mika Westerberg <mika.westerberg@linux.intel.com>
R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
R: Mika Westerberg <mika.westerberg@linux.intel.com>
R: Jan Dabros <jsd@semihalf.com>
L: linux-i2c@vger.kernel.org
S: Supported

2
drivers/i2c/busses/i2c-riic.c
View File

@ -386,7 +386,7 @@ static int riic_init_hw(struct riic_dev *riic)
*/
total_ticks = DIV_ROUND_UP(rate, t->bus_freq_hz ?: 1);
for (cks = 0; cks < 7; cks++) {
for (cks = 0; cks <= 7; cks++) {
/*
* 60% low time must be less than BRL + 2 + 1
* BRL max register value is 0x1F.

3
drivers/i2c/busses/i2c-rtl9300.c
View File

@ -307,8 +307,7 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s
static u32 rtl9300_i2c_func(struct i2c_adapter *a)
{
return I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA |
I2C_FUNC_SMBUS_I2C_BLOCK;
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA;
}
static const struct i2c_algorithm rtl9300_i2c_algo = {