tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull i2c fixes from Wolfram Sang:
"i2c host fixes: PNX used the wrong unit for timeouts, Nomadik was
missing a sentinel, and RIIC was missing rounding up"

* tag 'i2c-for-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: riic: Always round-up when calculating bus period
i2c: nomadik: Add missing sentinel to match table
i2c: pnx: Fix timeout in wait functions

Linus Torvalds 151167d8 dccbe204

+4 -3
+1
drivers/i2c/busses/i2c-nomadik.c
··· 1075 1075 .compatible = "mobileye,eyeq6h-i2c", 1076 1076 .data = (void *)NMK_I2C_EYEQ_FLAG_32B_BUS, 1077 1077 }, 1078 + { /* sentinel */ } 1078 1079 }; 1079 1080 1080 1081 static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
+2 -2
drivers/i2c/busses/i2c-pnx.c
··· 95 95 96 96 static inline int wait_timeout(struct i2c_pnx_algo_data *data) 97 97 { 98 - long timeout = data->timeout; 98 + long timeout = jiffies_to_msecs(data->timeout); 99 99 while (timeout > 0 && 100 100 (ioread32(I2C_REG_STS(data)) & mstatus_active)) { 101 101 mdelay(1); ··· 106 106 107 107 static inline int wait_reset(struct i2c_pnx_algo_data *data) 108 108 { 109 - long timeout = data->timeout; 109 + long timeout = jiffies_to_msecs(data->timeout); 110 110 while (timeout > 0 && 111 111 (ioread32(I2C_REG_CTL(data)) & mcntrl_reset)) { 112 112 mdelay(1);
+1 -1
drivers/i2c/busses/i2c-riic.c
··· 352 352 if (brl <= (0x1F + 3)) 353 353 break; 354 354 355 - total_ticks /= 2; 355 + total_ticks = DIV_ROUND_UP(total_ticks, 2); 356 356 rate /= 2; 357 357 } 358 358