[PATCH] gpio: rcar: reinstate generic compat string

[Simon Horman <horms+renesas@xxxxxxxxxxxx>]

commit d10bbd156926 ("gpio: rcar: add gen[123] fallback compatibility
strings") deprecated the generic compat string, renesas,gpio-rcar. After
further discussion this appears not to have been desirable as that compat
string is compatible with all R-Car SoCs supported in upstream.

This commit partially reverts that commit, and updates related
documentation and examples.

Fixes: d10bbd156926 ("gpio: rcar: add gen[123] fallback compatibility strings")
Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
---
 .../devicetree/bindings/gpio/renesas,gpio-rcar.txt     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
index 48634b01f1bf..347d8ede2982 100644
--- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
+++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt
@@ -16,11 +16,13 @@ Required Properties:
     - "renesas,rcar-gen1-gpio": for a generic R-Car Gen1 GPIO controller.
     - "renesas,rcar-gen2-gpio": for a generic R-Car Gen2 or RZ/G1 GPIO controller.
     - "renesas,rcar-gen3-gpio": for a generic R-Car Gen3 GPIO controller.
-    - "renesas,gpio-rcar": deprecated.
+    - "renesas,gpio-rcar": for generic R-Car GPIO controller.
 
-    When compatible with the generic version nodes must list the
-    SoC-specific version corresponding to the platform first followed by
-    the generic version.
+    Nodes should list all of the following that are compatible
+    in this order:
+    - A SoC-specific version
+    - A generic R-Car generation version
+    - The generic R-Car version
 
   - reg: Base address and length of each memory resource used by the GPIO
     controller hardware module.
@@ -50,7 +52,9 @@ interrupt-controller/interrupts.txt.
 Example: R8A7779 (R-Car H1) GPIO controller nodes
 
 	gpio0: gpio@ffc40000 {
-		compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio";
+		compatible = "renesas,gpio-r8a7779",
+			     "renesas,rcar-gen1-gpio",
+			     "renesas,gpio-rcar";
 		reg = <0xffc40000 0x2c>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 141 0x4>;
@@ -62,7 +66,9 @@ Example: R8A7779 (R-Car H1) GPIO controller nodes
 	};
 	...
 	gpio6: gpio@ffc46000 {
-		compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio";
+		compatible = "renesas,gpio-r8a7779",
+			     "renesas,rcar-gen1-gpio",
+			     "renesas,gpio-rcar";
 		reg = <0xffc46000 0x2c>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 147 0x4>;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html