gpio: move tca9554 from pcf857x to pca953x

The TCA9554 doesn't work with the pcf857x driver, trying to change the direction
gives a NAK bailout error.

TCA9554 is similar to the PCA9554, thus change the driver.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 63ceed246b6f94a814f3e4307feaae1c4d40b9d5..c0629e6639faf4c3b57cb680243a71123baded2b 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -752,7 +752,7 @@ config GPIO_PCA953X
          4 bits:       pca9536, pca9537
 
          8 bits:       max7310, max7315, pca6107, pca9534, pca9538, pca9554,
-                       pca9556, pca9557, pca9574, tca6408, xra1202
+                       pca9556, pca9557, pca9574, tca6408, tca9554, xra1202
 
          16 bits:      max7312, max7313, pca9535, pca9539, pca9555, pca9575,
                        tca6416

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index b9373785ccf53210fb4b0580937aadfd85b70ae2..4c9e21300a262170499a4e009af3638b79536579 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -82,6 +82,7 @@ static const struct i2c_device_id pca953x_id[] = {
        { "tca6416", 16 | PCA953X_TYPE | PCA_INT, },
        { "tca6424", 24 | PCA953X_TYPE | PCA_INT, },
        { "tca9539", 16 | PCA953X_TYPE | PCA_INT, },
+       { "tca9554", 8  | PCA953X_TYPE | PCA_INT, },
        { "xra1202", 8  | PCA953X_TYPE },
        { }
 };

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 895af42a4513581ae1b9f1059384ce866777f9f7..8ddf9302ce3b079adcd727c09ad56f9ce4b60883 100644 (file)
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -46,7 +46,6 @@ static const struct i2c_device_id pcf857x_id[] = {
        { "pca9675", 16 },
        { "max7328", 8 },
        { "max7329", 8 },
-       { "tca9554", 8 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf857x_id);
@@ -66,7 +65,6 @@ static const struct of_device_id pcf857x_of_table[] = {
        { .compatible = "nxp,pca9675" },
        { .compatible = "maxim,max7328" },
        { .compatible = "maxim,max7329" },
-       { .compatible = "ti,tca9554" },
        { }
 };
 MODULE_DEVICE_TABLE(of, pcf857x_of_table);