2 files changed, 19 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 0764f9ab63dc..e20eac7a3087 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -1,14 +1,22 @@
 * Renesas R-Car SATA
 
 Required properties:
-- compatible            : should contain one of the following:
+- compatible            : should contain one or more of the following:
                           - "renesas,sata-r8a7779" for R-Car H1
-                            ("renesas,rcar-sata" is deprecated)
                           - "renesas,sata-r8a7790-es1" for R-Car H2 ES1
                           - "renesas,sata-r8a7790" for R-Car H2 other than ES1
                           - "renesas,sata-r8a7791" for R-Car M2-W
                           - "renesas,sata-r8a7793" for R-Car M2-N
                           - "renesas,sata-r8a7795" for R-Car H3
+                          - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device
+                          - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device
+                          - "renesas,rcar-sata" is deprecated
+
+                          When compatible with the generic version nodes
+                          must list the SoC-specific version corresponding
+                          to the platform first followed by the generic
+                          version.
+
 - reg                   : address and length of the SATA registers;
 - interrupts            : must consist of one interrupt specifier.
 - clocks                : must contain a reference to the functional clock.
@@ -16,7 +24,7 @@ Required properties:
 Example:
 
 sata0: sata@ee300000 {
-        compatible = "renesas,sata-r8a7791";
+        compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
         reg = <0 0xee300000 0 0x2000>;
         interrupt-parent = <&gic>;
         interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index ee9844758736..537d11869069 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -858,6 +858,14 @@ static const struct of_device_id sata_rcar_match[] = {
                 .compatible = "renesas,sata-r8a7795",
                 .data = (void *)RCAR_GEN2_SATA
         },
+        {
+                .compatible = "renesas,rcar-gen2-sata",
+                .data = (void *)RCAR_GEN2_SATA
+        },
+        {
+                .compatible = "renesas,rcar-gen3-sata",
+                .data = (void *)RCAR_GEN2_SATA
+        },
         { },
 };
 MODULE_DEVICE_TABLE(of, sata_rcar_match);