Merge tag 'phy-for-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon...

Kishon writes:

phy: for 4.8 -rc1

*) Add a new phy_ops for setting the phy mode
*) Add a new phy driver for DA8xx SoC USB PHY
*) Minor fixes and cleanups

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --combined drivers/phy/Kconfig
index 8d1cfb7,02afc62..cc0b695
--- 1/drivers/phy/Kconfig
--- 2/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -44,6 -44,16 +44,16 @@@ config ARMADA375_USBCLUSTER_PH
        depends on OF && HAS_IOMEM
        select GENERIC_PHY
  
+ config PHY_DA8XX_USB
+       tristate "TI DA8xx USB PHY Driver"
+       depends on ARCH_DAVINCI_DA8XX
+       select GENERIC_PHY
+       select MFD_SYSCON
+       help
+         Enable this to support the USB PHY on DA8xx SoCs.
+ 
+         This driver controls both the USB 1.1 PHY and the USB 2.0 PHY.
+ 
  config PHY_DM816X_USB
        tristate "TI dm816x USB PHY driver"
        depends on ARCH_OMAP2PLUS
@@@ -176,7 -186,6 +186,7 @@@ config TWL4030_US
        tristate "TWL4030 USB Transceiver Driver"
        depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
        depends on USB_SUPPORT
 +      depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't 'y'
        select GENERIC_PHY
        select USB_PHY
        help