On Tue, Feb 12, 2019 at 06:43:19PM +0530, Kishon Vijay Abraham I wrote: > Hi Greg, > > Please find the pull request for 5.1 merge window below. > > It adds two new Armada PHY drivers to support COMPHY and UTMI PHY and a > PHY driver to support Cadence D-PHY. It also extends existing omap-usb2 PHY > driver, qcom-qmp PHY driver and qcom-qusb2 PHY driver to support PHYs in > newer platforms. It also includes minor fixes and cleanups. > > For the complete list of changes, please see the tag message below. > > Let me know If I have to make any modifications to this pull request. > > This pull request will conflict with -net pull request since one of the > Armada PHY drivers is merged via -net tree. The final resolution should > be like below > > diff --cc drivers/phy/marvell/Kconfig > index 224ea4e6a46d,b8e9dd38ad0d..000000000000 > --- a/drivers/phy/marvell/Kconfig > +++ b/drivers/phy/marvell/Kconfig > @@@ -21,16 -21,27 +21,37 @@@ config PHY_BERLIN_US > help > Enable this to support the USB PHY on Marvell Berlin SoCs. > > + config PHY_MVEBU_A3700_COMPHY > + tristate "Marvell A3700 comphy driver" > + depends on ARCH_MVEBU || COMPILE_TEST > + depends on OF > + depends on HAVE_ARM_SMCCC > + default y > + select GENERIC_PHY > + help > + This driver allows to control the comphy, a hardware block providing > + shared serdes PHYs on Marvell Armada 3700. Its serdes lanes can be > + used by various controllers: Ethernet, SATA, USB3, PCIe. > + > + config PHY_MVEBU_A3700_UTMI > + tristate "Marvell A3700 UTMI driver" > + depends on ARCH_MVEBU || COMPILE_TEST > + depends on OF > + default y > + select GENERIC_PHY > + help > + Enable this to support Marvell A3700 UTMI PHY driver. > + > +config PHY_MVEBU_A38X_COMPHY > + tristate "Marvell Armada 38x comphy driver" > + depends on ARCH_MVEBU || COMPILE_TEST > + depends on OF > + select GENERIC_PHY > + help > + This driver allows to control the comphy, an hardware block providing > + shared serdes PHYs on Marvell Armada 38x. Its serdes lanes can be > + used by various controllers (Ethernet, sata, usb, PCIe...). > + > config PHY_MVEBU_CP110_COMPHY > tristate "Marvell CP110 comphy driver" > depends on ARCH_MVEBU || COMPILE_TEST > diff --cc drivers/phy/marvell/Makefile > index 59b6c03ef756,82f291cf59ee..000000000000 > --- a/drivers/phy/marvell/Makefile > +++ b/drivers/phy/marvell/Makefile > @@@ -2,7 -2,8 +2,9 @@@ > obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o > obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o > obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o > + obj-$(CONFIG_PHY_MVEBU_A3700_COMPHY) += phy-mvebu-a3700-comphy.o > + obj-$(CONFIG_PHY_MVEBU_A3700_UTMI) += phy-mvebu-a3700-utmi.o > +obj-$(CONFIG_PHY_MVEBU_A38X_COMPHY) += phy-armada38x-comphy.o > obj-$(CONFIG_PHY_MVEBU_CP110_COMPHY) += phy-mvebu-cp110-comphy.o > obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o > obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o > > Thanks > Kishon > > The following changes since commit 827cb0323928952c0db9515aba9d534fb1285b3f: > > phy: ath79-usb: Fix the main reset name to match the DT binding (2019-01-16 > 18:00:57 +0530) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git > tags/phy-for-5.1
Pulled and pushed out, thanks. greg k-h
