diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-15 22:09:49 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-15 22:09:49 +0300 |
commit | c77756d3da0782cb90c1fbf6635db7aa480ad638 (patch) | |
tree | f77ae84bcb0fb8c67dccfa553eccbad981a25450 /drivers/i2c/busses/i2c-sh_mobile.c | |
parent | 4757c3c64a71820a37da7a14c5b63a1f26fed0f5 (diff) | |
parent | 91962feb9502bb98f830d90fe197653e6f4e84a4 (diff) | |
download | linux-c77756d3da0782cb90c1fbf6635db7aa480ad638.tar.xz |
Merge tag 'i2c-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang:
"Minor changes to the I2C core. Most changes are in drivers:
The i801 and designware drivers received most of the changes,
including refactorings and some additions.
Recovery changes for the iMX and iMX-LPI2C are now utilizing the
generic i2c support.
The Cadence driver now supports system suspend and resume.
The hisi, mpc, sh_mobile, and npcm drivers have undergone some
cleanups and improvements. Meanwhile, Uwe continues his work on
converting the "remove" callback to become a void function.
The pca954x mux driver now supports additional configurations, such as
isolating faulty channels and flushing stuck buses, among others.
Support has been added for Renesas r8a779h0, i.MX95 LPI2C, and
Microchip sam9x7. Meanwhile, Geert lays the groundwork for the
upcoming R-Car Gen4"
* tag 'i2c-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (34 commits)
i2c: sprd: Convert to platform remove callback returning void
Documentation: i2c: Document that client auto-detection is a legacy mechanism
i2c: remove redundant condition
i2c: rcar: Prepare for the advent of ARCH_RCAR_GEN4
i2c: imx-lpi2c: add generic GPIO recovery for LPI2C
i2c: cadence: Add system suspend and resume PM support
i2c: mpc: remove outdated macro
i2c: mpc: use proper binding for transfer timeouts
dt-bindings: i2c: mpc: use proper binding for transfer timeouts
i2c: smbus: Prepare i2c_register_spd for usage on muxed segments
i2c: constify the struct device_type usage
i2c: designware: Implement generic polling mode code for Wangxun 10Gb NIC
i2c: designware: Fix RX FIFO depth define on Wangxun 10Gb NIC
i2c: designware: Move interrupt handling functions before i2c_dw_xfer()
i2c: designware: Use accessors to DW_IC_INTR_MASK register
i2c: designware: Do not enable interrupts shortly in polling mode
i2c: designware: Uniform initialization flow for polling mode
dt-bindings: i2c: at91: Add sam9x7 compatible string
dt-bindings: i2c: imx-lpi2c: add i.MX95 LPI2C
i2c: Remove redundant comparison in npcm_i2c_reg_slave
...
Diffstat (limited to 'drivers/i2c/busses/i2c-sh_mobile.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 5adbe62cf621..c65ac3d7eadc 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -773,7 +773,7 @@ static int sh_mobile_i2c_r8a7740_workaround(struct sh_mobile_i2c_data *pd) iic_wr(pd, ICCR, ICCR_TRS); udelay(10); - return sh_mobile_i2c_init(pd); + return sh_mobile_i2c_v2_init(pd); } static const struct sh_mobile_dt_config default_dt_config = { @@ -783,11 +783,6 @@ static const struct sh_mobile_dt_config default_dt_config = { static const struct sh_mobile_dt_config fast_clock_dt_config = { .clks_per_count = 2, - .setup = sh_mobile_i2c_init, -}; - -static const struct sh_mobile_dt_config v2_freq_calc_dt_config = { - .clks_per_count = 2, .setup = sh_mobile_i2c_v2_init, }; @@ -799,17 +794,17 @@ static const struct sh_mobile_dt_config r8a7740_dt_config = { static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,iic-r8a73a4", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7740", .data = &r8a7740_dt_config }, - { .compatible = "renesas,iic-r8a774c0", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7790", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7791", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7792", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7793", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7794", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a7795", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,iic-r8a77990", .data = &v2_freq_calc_dt_config }, + { .compatible = "renesas,iic-r8a774c0", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7790", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7791", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7792", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7793", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7794", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, - { .compatible = "renesas,rcar-gen2-iic", .data = &v2_freq_calc_dt_config }, - { .compatible = "renesas,rcar-gen3-iic", .data = &v2_freq_calc_dt_config }, + { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {}, }; |