Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e434a90f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-5.1-rc-v2' of... 

Merge tag 'phy-for-5.1-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy

 into char-misc-next

Kishon writes:

phy: for 5.1-rc

  *) Fix sun4i-usb PHY driver to get USB gadget working on H3/R40/V3/V3s
  *) Fix cable state handling in phy-twl4030-usb driver to get rid of
     regulator_put() warning
  *) Fix linker errors and compilation warnings got with randconfig
  *) Fix sparse warnings and .cocci warnings

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

* tag 'phy-for-5.1-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy:
  phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode
  phy: fix platform_no_drv_owner.cocci warnings
  phy: mapphone-mdm6600: add gpiolib dependency
  phy: ti: usb2: fix OMAP_CONTROL_PHY dependency
  phy: allwinner: allow compile testing
  phy: qcom-ufs: Make ufs_qcom_phy_disable_iface_clk static
  phy: rockchip-typec: Make usb3_pll_cfg and dp_pll_cfg static
  phy: phy-twl4030-usb: Fix cable state handling
parents 5450a5f4 e6f32efb

drivers/phy/allwinner/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#

config PHY_SUN4I_USB

	tristate "Allwinner sunxi SoC USB PHY driver"

	depends on ARCH_SUNXI && HAS_IOMEM && OF

	depends on ARCH_SUNXI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on RESET_CONTROLLER

	depends on EXTCON

	depends on POWER_SUPPLY
@@ -19,7 +20,8 @@ config PHY_SUN4I_USB 


config PHY_SUN6I_MIPI_DPHY

	tristate "Allwinner A31 MIPI D-PHY Support"

	depends on ARCH_SUNXI && HAS_IOMEM && OF

	depends on ARCH_SUNXI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on RESET_CONTROLLER

	select GENERIC_PHY

	select GENERIC_PHY_MIPI_DPHY
@@ -31,7 +33,8 @@ config PHY_SUN6I_MIPI_DPHY 


config PHY_SUN9I_USB

	tristate "Allwinner sun9i SoC USB PHY driver"

	depends on ARCH_SUNXI && HAS_IOMEM && OF

	depends on ARCH_SUNXI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on RESET_CONTROLLER

	depends on USB_SUPPORT

	select USB_COMMON

drivers/phy/allwinner/phy-sun4i-usb.c

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work) 
	struct sun4i_usb_phy_data *data =

		container_of(work, struct sun4i_usb_phy_data, detect.work);

	struct phy *phy0 = data->phys[0].phy;

	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);

	bool force_session_end, id_notify = false, vbus_notify = false;

	int id_det, vbus_det;
@@ -610,6 +611,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work) 
			mutex_unlock(&phy0->mutex);

		}



		/* Enable PHY0 passby for host mode only. */

		sun4i_usb_phy_passby(phy, !id_det);



		/* Re-route PHY0 if necessary */

		if (data->cfg->phy0_dual_route)

			sun4i_usb_phy0_reroute(data, id_det);

drivers/phy/marvell/phy-mvebu-a3700-utmi.c

+0 −1
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ static struct platform_driver mvebu_a3700_utmi_driver = { 
	.probe	= mvebu_a3700_utmi_phy_probe,

	.driver	= {

		.name		= "mvebu-a3700-utmi-phy",

		.owner		= THIS_MODULE,

		.of_match_table	= mvebu_a3700_utmi_of_match,

	 },

};

drivers/phy/motorola/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config PHY_CPCAP_USB 


config PHY_MAPPHONE_MDM6600

	tristate "Motorola Mapphone MDM6600 modem USB PHY driver"

	depends on OF && USB_SUPPORT

	depends on OF && USB_SUPPORT && GPIOLIB

	select GENERIC_PHY

	help

	  Enable this for MDM6600 USB modem to work on Motorola phones

drivers/phy/qualcomm/phy-qcom-ufs.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int ufs_qcom_phy_enable_iface_clk(struct ufs_qcom_phy *phy) 
}



/* Turn OFF M-PHY RMMI interface clocks */

void ufs_qcom_phy_disable_iface_clk(struct ufs_qcom_phy *phy)

static void ufs_qcom_phy_disable_iface_clk(struct ufs_qcom_phy *phy)

{

	if (phy->is_iface_clk_enabled) {

		clk_disable_unprepare(phy->tx_iface_clk);