Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / phy / Kconfig

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 330ef2d065670eb91b84a6d553bdf1df2dabf79f..afa2354f6600e72d904ea907ee92f775010ae8a9 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -16,11 +16,18 @@ config GENERIC_PHY
          framework should select this config.
 
 config PHY_EXYNOS_MIPI_VIDEO
+       depends on HAS_IOMEM
        tristate "S5P/EXYNOS SoC series MIPI CSI-2/DSI PHY driver"
        help
          Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
          and EXYNOS SoCs.
 
+config PHY_MVEBU_SATA
+       def_bool y
+       depends on ARCH_KIRKWOOD || ARCH_DOVE
+       depends on OF
+       select GENERIC_PHY
+
 config OMAP_USB2
        tristate "OMAP USB2 PHY Driver"
        depends on ARCH_OMAP2PLUS
@@ -51,4 +58,10 @@ config PHY_EXYNOS_DP_VIDEO
        help
          Support for Display Port PHY found on Samsung EXYNOS SoCs.
 
+config BCM_KONA_USB2_PHY
+       tristate "Broadcom Kona USB2 PHY Driver"
+       depends on GENERIC_PHY
+       help
+         Enable this to support the Broadcom Kona USB 2.0 PHY.
+
 endmenu