summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Packham <chris.packham@alliedtelesis.co.nz>2017-07-05 22:13:58 +1200
committerWolfram Sang <wsa@the-dreams.de>2018-03-24 13:26:13 +0100
commiteb49778c8c6cbe075cf90d741ccf16f674a8db4e (patch)
tree09b2bac7a0eff24cea84938045673e7595cc74bc
parent7562dee282244aade6fa183487bf2fcecaa42a20 (diff)
downloadblackbird-op-linux-eb49778c8c6cbe075cf90d741ccf16f674a8db4e.tar.gz
blackbird-op-linux-eb49778c8c6cbe075cf90d741ccf16f674a8db4e.zip
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 <chris.packham@alliedtelesis.co.nz> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r--arch/blackfin/mach-bf561/boards/acvilon.c1
-rw-r--r--arch/sh/boards/board-sh7785lcr.c1
-rw-r--r--include/linux/i2c-pca-platform.h3
3 files changed, 0 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 696cc9d7820a..9dd612220211 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 caec1ebffb09..d7d232dea33e 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 0e5f7c77d1d8..c37329432a8e 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 */
};
OpenPOWER on IntegriCloud