Hi Wolfram,
after Linus pulled the commit from Christophe, which was causing
conflicts with the I2C Zhaoxin controller, I'm sending you the
second part of pull request for v6.9, which includes only the six
patches from Hans that add support.
This series is in i2c/i2c-host-next. I haven't created a new
branch since it has already been tested here for several days
here.
If time permits, there are two series from Theo and Mukesh queued
in i2c/i2c-host.
Thanks,
Andi
The following changes since commit b3b00cea6378475f972eb49c068062627ff3a14d:
Merge branch 'i2c/i2c-host' into i2c/i2c-host-next (2024-03-08 23:30:28 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git tags/i2c-host-6.9-pt.2-zhaoxin
for you to fetch changes up to 391ead8dc4e49b6de96ffdd1f6b1d89fa2282e40:
i2c: add zhaoxin i2c controller driver (2024-03-08 23:30:50 +0100)
----------------------------------------------------------------
Added support for the Zhaoxin I2C controller. This required
extensive code refactoring in the wmt driver, mainly targeting
the extraction of the common IP from the viai2c, which will be
used by both wmt and Zhaoxin.
----------------------------------------------------------------
Hans Hu (6):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: split out common files
i2c: wmt: rename something
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +++-
drivers/i2c/busses/Kconfig | 10 ++++
drivers/i2c/busses/Makefile | 3 ++
drivers/i2c/busses/i2c-viai2c-common.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++++++++++++++++++++++++++++++
drivers/i2c/busses/i2c-viai2c-wmt.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/i2c/busses/i2c-wmt.c | 421 -------------------------------------------------------------------------------------------------------------------------------------------------------------------
8 files changed, 804 insertions(+), 422 deletions(-)
create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c
create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h
create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c
create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c
delete mode 100644 drivers/i2c/busses/i2c-wmt.c
Hi Wolfram,
> The following changes since commit b3b00cea6378475f972eb49c068062627ff3a14d:
>
> Merge branch 'i2c/i2c-host' into i2c/i2c-host-next (2024-03-08 23:30:28 +0100)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git tags/i2c-host-6.9-pt.2-zhaoxin
>
> for you to fetch changes up to 391ead8dc4e49b6de96ffdd1f6b1d89fa2282e40:
>
> i2c: add zhaoxin i2c controller driver (2024-03-08 23:30:50 +0100)
Let's drop this pull request. Hans has found an issue here and I
think the best to do is to postpone the Xhaoxin i2c controller to
the next merge window.
Thanks Hans for your understanding.
Andi