summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/ata
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-01 06:21:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-01 06:21:03 +0300
commitc00552ebafddfe6abb397d957004f165e010abd2 (patch)
treeb397d6773b545755ffdae7566f8b96b08ee54ebb /Documentation/devicetree/bindings/ata
parent842f57baab186417d89810f3dd6147f1ef3009dd (diff)
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
downloadlinux-c00552ebafddfe6abb397d957004f165e010abd2.tar.xz
Merge 3.18-rc7 into usb-next
We need the xhci fixes here and this resolves a merge issue with drivers/usb/dwc3/ep0.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/ata')
-rw-r--r--Documentation/devicetree/bindings/ata/sata_rcar.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 1e6111333fa8..80ae87a0784b 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -3,8 +3,10 @@
Required properties:
- compatible : should contain one of the following:
- "renesas,sata-r8a7779" for R-Car H1
- - "renesas,sata-r8a7790" for R-Car H2
- - "renesas,sata-r8a7791" for R-Car M2
+ - "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
- reg : address and length of the SATA registers;
- interrupts : must consist of one interrupt specifier.