diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-03 07:13:41 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-03 07:13:41 +0200 |
commit | b3d424e3dcbb5eba572baae30e1052b2fff7b51e (patch) | |
tree | 8055b6dca7b3cda1beffc6f5aee3a7602daef09b /drivers/phy/Kconfig | |
parent | USB: usbtmc: add device quirk for Rigol DS6104 (diff) | |
parent | phy: twl4030-usb: add ABI documentation (diff) | |
download | linux-b3d424e3dcbb5eba572baae30e1052b2fff7b51e.tar.xz linux-b3d424e3dcbb5eba572baae30e1052b2fff7b51e.zip |
Merge tag 'phy-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
phy: for 4.2 merge window
*) new Broadcom SATA3 PHY driver for Broadcom STB SoCs
*) new phy API to get PHY by index which is used in EHCI and
OHCI controller drivers
*) support specifying supply at port level used for multi-port PHYs
*) sparse warning fixes in miphy PHYs
*) fix pm_runtime issues in twl4030 driver
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/Kconfig')
-rw-r--r-- | drivers/phy/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index fceac96c2a31..56e1b7585d27 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -316,4 +316,13 @@ config PHY_TUSB1210 help Support for TI TUSB1210 USB ULPI PHY. +config PHY_BRCMSTB_SATA + tristate "Broadcom STB SATA PHY driver" + depends on ARCH_BRCMSTB + depends on OF + select GENERIC_PHY + help + Enable this to support the SATA3 PHY on 28nm Broadcom STB SoCs. + Likely useful only with CONFIG_SATA_BRCMSTB enabled. + endmenu |