| From afb2129c0479f584c84ee659be293b1ffc52ad70 Mon Sep 17 00:00:00 2001 |
| From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> |
| Date: Tue, 21 Jul 2015 11:08:50 +0200 |
| Subject: [PATCH 139/326] gpio: rcar: Add r8a7795 (R-Car H3) support |
| |
| R-Car Gen3's GPIO blocks are identical to Gen2's in every respect. |
| |
| Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 8cd14702be9bcb2ec45e1ec30af04aea9b965708) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 + |
| drivers/gpio/gpio-rcar.c | 4 ++++ |
| 2 files changed, 5 insertions(+) |
| |
| diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt |
| index 38fb86f28ba2..f60e2f477e93 100644 |
| --- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt |
| +++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt |
| @@ -9,6 +9,7 @@ Required Properties: |
| - "renesas,gpio-r8a7791": for R8A7791 (R-Car M2-W) compatible GPIO controller. |
| - "renesas,gpio-r8a7793": for R8A7793 (R-Car M2-N) compatible GPIO controller. |
| - "renesas,gpio-r8a7794": for R8A7794 (R-Car E2) compatible GPIO controller. |
| + - "renesas,gpio-r8a7795": for R8A7795 (R-Car H3) compatible GPIO controller. |
| - "renesas,gpio-rcar": for generic R-Car GPIO controller. |
| |
| - reg: Base address and length of each memory resource used by the GPIO |
| diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c |
| index 4fc13ce9c60a..2a8122444614 100644 |
| --- a/drivers/gpio/gpio-rcar.c |
| +++ b/drivers/gpio/gpio-rcar.c |
| @@ -342,6 +342,10 @@ static const struct of_device_id gpio_rcar_of_table[] = { |
| .compatible = "renesas,gpio-r8a7794", |
| .data = &gpio_rcar_info_gen2, |
| }, { |
| + .compatible = "renesas,gpio-r8a7795", |
| + /* Gen3 GPIO is identical to Gen2. */ |
| + .data = &gpio_rcar_info_gen2, |
| + }, { |
| .compatible = "renesas,gpio-rcar", |
| .data = &gpio_rcar_info_gen1, |
| }, { |
| -- |
| 2.6.2 |
| |
