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 branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
"I2C has two simple but wanted driver fixes for you"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: pca-platform: Fix GPIO lookup code
i2c: acorn: fix i2c warning

Linus Torvalds 5dcedf46 6e7739fc

+2 -2
+1
drivers/i2c/busses/i2c-acorn.c
··· 81 81 82 82 static struct i2c_adapter ioc_ops = { 83 83 .nr = 0, 84 + .name = "ioc", 84 85 .algo_data = &ioc_data, 85 86 }; 86 87
+1 -2
drivers/i2c/busses/i2c-pca-platform.c
··· 21 21 #include <linux/platform_device.h> 22 22 #include <linux/i2c-algo-pca.h> 23 23 #include <linux/platform_data/i2c-pca-platform.h> 24 - #include <linux/gpio.h> 25 24 #include <linux/gpio/consumer.h> 26 25 #include <linux/io.h> 27 26 #include <linux/of.h> ··· 172 173 i2c->adap.dev.parent = &pdev->dev; 173 174 i2c->adap.dev.of_node = np; 174 175 175 - i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset-gpios", GPIOD_OUT_LOW); 176 + i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_OUT_LOW); 176 177 if (IS_ERR(i2c->gpio)) 177 178 return PTR_ERR(i2c->gpio); 178 179