Skip to content

Commit 9cf1afe

Browse files
committed
Merge tag 'i2c-for-7.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: - davinci: fix fallback bus frequency on missing clock-frequency - virtio: mark device ready initially * tag 'i2c-for-7.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: virtio: mark device ready before registering the adapter i2c: davinci: fix division by zero on missing clock-frequency
2 parents 227abb7 + 1d77458 commit 9cf1afe

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/i2c/busses/i2c-davinci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
/* timeout for pm runtime autosuspend */
118118
#define DAVINCI_I2C_PM_TIMEOUT 1000 /* ms */
119119

120-
#define DAVINCI_I2C_DEFAULT_BUS_FREQ 100
120+
#define DAVINCI_I2C_DEFAULT_BUS_FREQ 100000
121121

122122
struct davinci_i2c_dev {
123123
struct device *dev;

drivers/i2c/busses/i2c-virtio.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ static int virtio_i2c_probe(struct virtio_device *vdev)
222222
*/
223223
ACPI_COMPANION_SET(&vi->adap.dev, ACPI_COMPANION(vdev->dev.parent));
224224

225+
virtio_device_ready(vdev);
226+
225227
ret = i2c_add_adapter(&vi->adap);
226228
if (ret)
227229
virtio_i2c_del_vqs(vdev);

0 commit comments

Comments
 (0)