Commit 5dcedf46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6e7739fc a0cac264

drivers/i2c/busses/i2c-acorn.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data ioc_data = { 


static struct i2c_adapter ioc_ops = {

	.nr			= 0,

	.name			= "ioc",

	.algo_data		= &ioc_data,

};

drivers/i2c/busses/i2c-pca-platform.c

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/platform_device.h>

#include <linux/i2c-algo-pca.h>

#include <linux/platform_data/i2c-pca-platform.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -173,7 +172,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) 
	i2c->adap.dev.parent = &pdev->dev;

	i2c->adap.dev.of_node = np;



	i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset-gpios", GPIOD_OUT_LOW);

	i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(i2c->gpio))

		return PTR_ERR(i2c->gpio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE