aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2018-03-10 06:00:01 -0500
committerLinus Walleij <linus.walleij@linaro.org>2018-03-27 09:18:20 -0400
commit3a711e0dd4e68f6b202db3f9e2c0086a8780da25 (patch)
tree7b2e3f68d9ebeb40e9f3a086437ee48e78be59d2
parente6bf37736f6495fb87ce5525d1f6fd2adce307f1 (diff)
gpio: pca953x: add compatibility for pcal6524 and pcal9555a
The Pyra-Handheld originally used the tca6424 but recently we have replaced it by the pin and package compatible pcal6524. So let's add this to the bindings and the driver. And while we are at it, the pcal9555a does not have a compatible entry either but is already supported by the device id table. Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/gpio/gpio-pca953x.txt2
-rw-r--r--drivers/gpio/gpio-pca953x.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
index 0d0158728f89..d2a937682836 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
@@ -16,6 +16,8 @@ Required properties:
16 nxp,pca9574 16 nxp,pca9574
17 nxp,pca9575 17 nxp,pca9575
18 nxp,pca9698 18 nxp,pca9698
19 nxp,pcal6524
20 nxp,pcal9555a
19 maxim,max7310 21 maxim,max7310
20 maxim,max7312 22 maxim,max7312
21 maxim,max7313 23 maxim,max7313
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index a0a5f9730aa7..d2ead4b1cf61 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -70,6 +70,7 @@ static const struct i2c_device_id pca953x_id[] = {
70 { "pca9575", 16 | PCA957X_TYPE | PCA_INT, }, 70 { "pca9575", 16 | PCA957X_TYPE | PCA_INT, },
71 { "pca9698", 40 | PCA953X_TYPE, }, 71 { "pca9698", 40 | PCA953X_TYPE, },
72 72
73 { "pcal6524", 24 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
73 { "pcal9555a", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, }, 74 { "pcal9555a", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
74 75
75 { "max7310", 8 | PCA953X_TYPE, }, 76 { "max7310", 8 | PCA953X_TYPE, },
@@ -935,6 +936,9 @@ static const struct of_device_id pca953x_dt_ids[] = {
935 { .compatible = "nxp,pca9575", .data = OF_957X(16, PCA_INT), }, 936 { .compatible = "nxp,pca9575", .data = OF_957X(16, PCA_INT), },
936 { .compatible = "nxp,pca9698", .data = OF_953X(40, 0), }, 937 { .compatible = "nxp,pca9698", .data = OF_953X(40, 0), },
937 938
939 { .compatible = "nxp,pcal6524", .data = OF_953X(24, PCA_INT), },
940 { .compatible = "nxp,pcal9555a", .data = OF_953X(16, PCA_INT), },
941
938 { .compatible = "maxim,max7310", .data = OF_953X( 8, 0), }, 942 { .compatible = "maxim,max7310", .data = OF_953X( 8, 0), },
939 { .compatible = "maxim,max7312", .data = OF_953X(16, PCA_INT), }, 943 { .compatible = "maxim,max7312", .data = OF_953X(16, PCA_INT), },
940 { .compatible = "maxim,max7313", .data = OF_953X(16, PCA_INT), }, 944 { .compatible = "maxim,max7313", .data = OF_953X(16, PCA_INT), },