diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 12:57:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 12:57:17 -0800 |
| commit | 9dd70e2880b8c8386097de51564c60352b3e4070 (patch) | |
| tree | 5b93eb90f7b20bbd9fc59d0ea9d7b72c7977009f /Documentation | |
| parent | 22a8f39c520fc577c02b4e5c99f8bb3b6017680b (diff) | |
| parent | 7e053d3e820bedd7ea4dad598d40bfc7639428c6 (diff) | |
Merge tag 'for-5.6/libata-2020-01-27' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe:
"As usual pretty quiet, mostly trivial fixes (or dead code removal),
outside of various fixes for ahci_bcrm"
* tag 'for-5.6/libata-2020-01-27' of git://git.kernel.dk/linux-block:
ata/acard_ahci: remove unused variable n_elem
ata: pata_macio: fix comparing pointer to 0
ata: ahci_brcm: BCM7216 reset is self de-asserting
ata: ahci_brcm: Perform reset after obtaining resources
ata: brcm: fix reset controller API usage
ata: brcm: mark PM functions as __maybe_unused
ata: ahci_brcm: Support BCM7216 reset controller name
dt-bindings: ata: Document BCM7216 AHCI controller compatible
ata: ahci_brcm: Add a shutdown callback
ata: ahci_brcm: Manage reset line during suspend/resume
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt b/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt index 7713a413c6a7..b9ae4ce4a0a0 100644 --- a/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt +++ b/Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt @@ -5,6 +5,7 @@ Each SATA controller should have its own node. Required properties: - compatible : should be one or more of + "brcm,bcm7216-ahci" "brcm,bcm7425-ahci" "brcm,bcm7445-ahci" "brcm,bcm-nsp-ahci" @@ -14,6 +15,12 @@ Required properties: - reg-names : "ahci" and "top-ctrl" - interrupts : interrupt mapping for SATA IRQ +Optional properties: + +- reset: for "brcm,bcm7216-ahci" must be a valid reset phandle + pointing to the RESCAL reset controller provider node. +- reset-names: for "brcm,bcm7216-ahci", must be "rescal". + Also see ahci-platform.txt. Example: |