diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 14:32:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 14:32:54 -0800 |
| commit | 11eaaadb3ea376c6c194491c2e9bddd647f9d253 (patch) | |
| tree | 461f130ddbf07737128a1bb115775e41bce22643 /Documentation | |
| parent | e25ac7ddaae0e798f794cdaf9109bc71246110cd (diff) | |
| parent | 159b5bb46492e4dcef2070b12861030bc360402b (diff) | |
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"Most are ahci and other device specific additions. Dan cleaned up
ahci IRQ handling to prepare for future MSIX changes. On the libata
core side, Vinayak updated SG handling so that NCQ commands can be
issued through SG_IO and Christoph cleaned up code a bit. There's one
merge from for-4.3-fixes to include a pata_macio commit that didn't
get pushed out"
* 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci: add new Intel device IDs
ahci: Add Marvell 88se91a2 device id
ahci: cleanup ahci_host_activate_multi_irqs
ahci: ahci_host_activate: kill IRQF_SHARED
devicetree: bindings: Fixed a few typos
ahci: qoriq: Disable NCQ on ls2080a SoC
ahci: qoriq: Rename LS2085A SoC support code to LS2080A
libata: enable LBA flag in taskfile for ata_scsi_pass_thru()
libata: add support for NCQ commands for SG interface
ahci: qoriq: Fix a compiling warning
pata_it821x: use "const char *" for string literals
libata: only call ->done once all per-tag ressources are released
libata: cleanup ata_scsi_qc_complete
ata: ahci: find eSATA ports and flag them as removable
libata: samsung_cf: fix handling platform_get_irq result
ata: pata_macio: Fix module autoload for OF platform driver
ata: pata_pxa: dmaengine conversion
ahci: added a new driver for supporting Freescale AHCI sata
devicetree:bindings: add devicetree bindings for Freescale AHCI
Revert "ahci: added support for Freescale AHCI sata"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt | 21 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ahci-platform.txt | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt new file mode 100644 index 000000000000..032a7606b862 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt @@ -0,0 +1,21 @@ +Binding for Freescale QorIQ AHCI SATA Controller + +Required properties: + - reg: Physical base address and size of the controller's register area. + - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where + chip could be ls1021a, ls2080a, ls1043a etc. + - clocks: Input clock specifier. Refer to common clock bindings. + - interrupts: Interrupt specifier. Refer to interrupt binding. + +Optional properties: + - dma-coherent: Enable AHCI coherent DMA operation. + - reg-names: register area names when there are more than 1 register area. + +Examples: + sata@3200000 { + compatible = "fsl,ls1021a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&platform_clk 1>; + dma-coherent; + }; diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index a2321819e7f5..c2340eeeb97f 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -16,8 +16,6 @@ Required properties: - "snps,dwc-ahci" - "snps,exynos5440-ahci" - "snps,spear-ahci" - - "fsl,qoriq-ahci" : for qoriq series socs which include ls1021, ls2085, etc. - - "fsl,<chip>-ahci" : chip could be ls1021, ls2085 etc. - "generic-ahci" - interrupts : <interrupt mapping for SATA IRQ> - reg : <registers mapping> |