| From 3318d957d96d8b67fbcdda6b09353394a0f9e8c9 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Thu, 16 Nov 2017 23:18:32 +0300 |
| Subject: [PATCH 0403/1795] gpio: pca953x: fix vendor prefix for PCA9654 |
| |
| Despite commit 55020c8056a8 ("of: Add vendor prefix for ON Semiconductor |
| Corp.") was made long ago, the latter commit 9f49f6dd0473 ("gpio: pca953x: |
| add onsemi,pca9654 id") made use of another, undocumented vendor prefix. |
| Since such prefix doesn't seem to be used in any device trees, I think we |
| can just fix the "compatible" string in the driver and the bindings and be |
| done with that... |
| |
| Fixes: 9f49f6dd0473 ("gpio: pca953x: add onsemi,pca9654 id") |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 8a64e557f399090f5d1917b2f32a065da2b12be1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 2 +- |
| drivers/gpio/gpio-pca953x.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt |
| index 7f57271df2bc..0d0158728f89 100644 |
| --- a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt |
| +++ b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt |
| @@ -27,7 +27,7 @@ Required properties: |
| ti,tca6424 |
| ti,tca9539 |
| ti,tca9554 |
| - onsemi,pca9654 |
| + onnn,pca9654 |
| exar,xra1202 |
| |
| Optional properties: |
| diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c |
| index 1b9dbf691ae7..c4795167119b 100644 |
| --- a/drivers/gpio/gpio-pca953x.c |
| +++ b/drivers/gpio/gpio-pca953x.c |
| @@ -947,7 +947,7 @@ static const struct of_device_id pca953x_dt_ids[] = { |
| { .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), }, |
| { .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), }, |
| |
| - { .compatible = "onsemi,pca9654", .data = OF_953X( 8, PCA_INT), }, |
| + { .compatible = "onnn,pca9654", .data = OF_953X( 8, PCA_INT), }, |
| |
| { .compatible = "exar,xra1202", .data = OF_953X( 8, 0), }, |
| { } |
| -- |
| 2.19.0 |
| |