diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-22 18:03:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-22 18:03:31 +0100 |
| commit | 13775dacca5c158a257320f4b47e1220b82e3b21 (patch) | |
| tree | 5ce47e235ab61ef320f49a0cadac8f52f0beecb1 /drivers/ata/Kconfig | |
| parent | 6ab9e09238fdfd742fe23b81e2d385a1cab49d9b (diff) | |
| parent | b3cd92db6ecde0a1c3651771a23f45b708533de4 (diff) | |
Merge tag 'for-4.20/libata-20181021' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe:
"Here are the libata changes queued up for 4.20:
- %pOFn device_node.name conversion (Rob Herring)
- Use LBAM/LBAH password defines instead of hardcoding (Linus
Walleij)
- Series adding support for the allwinner R40 AHCI controller
(Corentin Labbe)
- Disable ALPM for Ampere Computing device (Suman Tripathi)
- ahci bcrm fixes (Florian Fainelli)
- Redundant Kconfig defaults (Bartlomiej Zolnierkiewicz)
- Code cleanups (Nathan Chancellor)"
* tag 'for-4.20/libata-20181021' of git://git.kernel.dk/linux-block:
ata: remove redundant 'default n' from Kconfig
ata: ep93xx: Use proper enums for directions
ata: ahci_brcm: Allow using driver or DSL SoCs
ata: ahci_brcm: Match BCM63138 compatible strings
ata: ahci_brcm: Allow optional reset controller to be used
dt-bindings: ata: Document BCM63138 compatible string
pata_atiixp: Remove unnecessary parentheses
ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA
dt-bindings: ata: update ahci_sunxi bindings
ata: ahci_sunxi: add support for r40
dt-bindings: ata: ahci-platform: document phy-supply
ata: ahci_platform: add support for PHY controller regulator
dt-bindings: ata: ahci-platform: document ahci-supply
ata: ahci_platform: add support for AHCI controller regulator
dt-bindings: ata: ahci-platform: fix indentation of target-supply
libata: Use SMART LBAM/LBAH password defines
ata: ahci: Convert to using %pOFn instead of device_node.name
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 39b181d6bd0d..4ca7a6b4eaae 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -33,7 +33,6 @@ if ATA config ATA_NONSTANDARD bool - default n config ATA_VERBOSE_ERROR bool "Verbose ATA error reporting" @@ -62,7 +61,6 @@ config ATA_ACPI config SATA_ZPODD bool "SATA Zero Power Optical Disc Drive (ZPODD) support" depends on ATA_ACPI && PM - default n help This option adds support for SATA Zero Power Optical Disc Drive (ZPODD). It requires both the ODD and the platform @@ -121,7 +119,8 @@ config SATA_AHCI_PLATFORM config AHCI_BRCM tristate "Broadcom AHCI SATA support" - depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \ + ARCH_BCM_63XX help This option enables support for the AHCI SATA3 controller found on Broadcom SoC's. |