From: Chris Packham Date: Wed, 5 Jul 2017 10:13:58 +0000 (+1200) Subject: i2c: pca-platform: drop gpio from platform data X-Git-Tag: v5.15~9083^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb49778c8c6cbe075cf90d741ccf16f674a8db4e;p=platform%2Fkernel%2Flinux-starfive.git i2c: pca-platform: drop gpio from platform data Now that the i2c-pca-plaform driver is using the device managed API for gpios there is no need for the reset gpio to be specified via i2c_pca9564_pf_platform_data. Signed-off-by: Chris Packham Signed-off-by: Wolfram Sang --- diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c index 696cc9d..9dd6122 100644 --- a/arch/blackfin/mach-bf561/boards/acvilon.c +++ b/arch/blackfin/mach-bf561/boards/acvilon.c @@ -112,7 +112,6 @@ static struct resource bfin_i2c_pca_resources[] = { }; struct i2c_pca9564_pf_platform_data pca9564_platform_data = { - .gpio = -1, .i2c_clock_speed = 330000, .timeout = HZ, }; diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index caec1eb..d7d232d 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c @@ -253,7 +253,6 @@ static struct gpiod_lookup_table i2c_gpio_table = { }; static struct i2c_pca9564_pf_platform_data i2c_platform_data = { - .gpio = 0, .i2c_clock_speed = I2C_PCA_CON_330kHz, .timeout = HZ, }; diff --git a/include/linux/i2c-pca-platform.h b/include/linux/i2c-pca-platform.h index 0e5f7c7..c373294 100644 --- a/include/linux/i2c-pca-platform.h +++ b/include/linux/i2c-pca-platform.h @@ -3,9 +3,6 @@ #define I2C_PCA9564_PLATFORM_H struct i2c_pca9564_pf_platform_data { - int gpio; /* pin to reset chip. driver will work when - * not supplied (negative value), but it - * cannot exit some error conditions then */ int i2c_clock_speed; /* values are defined in linux/i2c-algo-pca.h */ int timeout; /* timeout in jiffies */ };