diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 22:41:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 22:41:21 -0700 |
| commit | 3b9f8ed25dbe5f858b1331588929f2a766aef55f (patch) | |
| tree | e577ceebaef76c7c6a38b471af19f8a3fd8cb659 /drivers/ata/Kconfig | |
| parent | 608c1d3c17e9e0e87dae69b9bb78f0556006ee6e (diff) | |
| parent | 795ef788145ed2fa023efdf11e8d5d7bedc21462 (diff) | |
| download | linux-stable-3b9f8ed25dbe5f858b1331588929f2a766aef55f.tar.gz linux-stable-3b9f8ed25dbe5f858b1331588929f2a766aef55f.tar.bz2 linux-stable-3b9f8ed25dbe5f858b1331588929f2a766aef55f.zip | |
Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"Except for the ahci fix that fixes a boot issue, nothing major in this
pull request. Some new platform controller support and device specific
changes"
* 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: zpodd: make arrays cdb static, reduces object code size
ahci: don't use MSI for devices with the silly Intel NVMe remapping scheme
dt-bindings: ata: add DT bindings for MediaTek SATA controller
ata: mediatek: add support for MediaTek SATA controller
pata_octeon_cf: use of_property_read_{bool|u32}()
cs5536: add support for IDE controller variant
ata: sata_gemini: Introduce explicit IDE pin control
ata: sata_gemini: Retire custom pin control
ata: ahci_platform: Add shutdown handler
ata: sata_gemini: explicitly request exclusive reset control
ata: Drop unnecessary static
ata: Convert to using %pOF instead of full_name
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 363fc5330c21..488c93724220 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -153,6 +153,16 @@ config AHCI_CEVA If unsure, say N. +config AHCI_MTK + tristate "MediaTek AHCI SATA support" + depends on ARCH_MEDIATEK + select MFD_SYSCON + help + This option enables support for the MediaTek SoC's + onboard AHCI SATA controller. + + If unsure, say N. + config AHCI_MVEBU tristate "Marvell EBU AHCI SATA support" depends on ARCH_MVEBU |