2 files changed, 21 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
index 941a26aa4322..38fb86f28ba2 100644
--- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
+++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
@@ -6,7 +6,9 @@ Required Properties:
     - "renesas,gpio-r8a7778": for R8A7778 (R-Mobile M1) compatible GPIO controller.
     - "renesas,gpio-r8a7779": for R8A7779 (R-Car H1) compatible GPIO controller.
     - "renesas,gpio-r8a7790": for R8A7790 (R-Car H2) compatible GPIO controller.
-    - "renesas,gpio-r8a7791": for R8A7791 (R-Car M2) compatible GPIO controller.
+    - "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-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 bf6c09450fee..584484e3f1e3 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -1,6 +1,7 @@
 /*
  * Renesas R-Car GPIO Support
  *
+ *  Copyright (C) 2014 Renesas Electronics Corporation
  *  Copyright (C) 2013 Magnus Damm
  *
  * This program is free software; you can redistribute it and/or modify
@@ -291,22 +292,30 @@ struct gpio_rcar_info {
         bool has_both_edge_trigger;
 };
 
+static const struct gpio_rcar_info gpio_rcar_info_gen1 = {
+        .has_both_edge_trigger = false,
+};
+
+static const struct gpio_rcar_info gpio_rcar_info_gen2 = {
+        .has_both_edge_trigger = true,
+};
+
 static const struct of_device_id gpio_rcar_of_table[] = {
         {
                 .compatible = "renesas,gpio-r8a7790",
-                .data = (void *)&(const struct gpio_rcar_info) {
-                        .has_both_edge_trigger = true,
-                },
+                .data = &gpio_rcar_info_gen2,
         }, {
                 .compatible = "renesas,gpio-r8a7791",
-                .data = (void *)&(const struct gpio_rcar_info) {
-                        .has_both_edge_trigger = true,
-                },
+                .data = &gpio_rcar_info_gen2,
+        }, {
+                .compatible = "renesas,gpio-r8a7793",
+                .data = &gpio_rcar_info_gen2,
+        }, {
+                .compatible = "renesas,gpio-r8a7794",
+                .data = &gpio_rcar_info_gen2,
         }, {
                 .compatible = "renesas,gpio-rcar",
-                .data = (void *)&(const struct gpio_rcar_info) {
-                        .has_both_edge_trigger = false,
-                },
+                .data = &gpio_rcar_info_gen1,
         }, {
                 /* Terminator */
         },