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

Merge tag 'phy-fixes-5.11' of... 

Merge tag 'phy-fixes-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next

Vinod writes:

phy: fixes for 5.11

*) Fix Ingenic driver build
*) Warning fix for cpcap-usb
*) Compile test enabling for mediatek phy

* tag 'phy-fixes-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: mediatek: allow compile-testing the dsi phy
  phy: cpcap-usb: Fix warning for missing regulator_disable
  PHY: Ingenic: fix unconditional build of phy-ingenic-usb
parents 7c53f6b6 d092bd91

drivers/phy/ingenic/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y		+= phy-ingenic-usb.o
 
obj-$(CONFIG_PHY_INGENIC_USB)		+= phy-ingenic-usb.o

drivers/phy/mediatek/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ config PHY_MTK_HDMI 


config PHY_MTK_MIPI_DSI

	tristate "MediaTek MIPI-DSI Driver"

	depends on ARCH_MEDIATEK && OF

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on COMMON_CLK

	depends on OF

	select GENERIC_PHY

	help

	  Support MIPI DSI for Mediatek SoCs.

drivers/phy/motorola/phy-cpcap-usb.c

+13 −6
Original line number Diff line number Diff line
@@ -662,35 +662,42 @@ static int cpcap_usb_phy_probe(struct platform_device *pdev) 
	generic_phy = devm_phy_create(ddata->dev, NULL, &ops);

	if (IS_ERR(generic_phy)) {

		error = PTR_ERR(generic_phy);

		return PTR_ERR(generic_phy);

		goto out_reg_disable;

	}



	phy_set_drvdata(generic_phy, ddata);



	phy_provider = devm_of_phy_provider_register(ddata->dev,

						     of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);

	if (IS_ERR(phy_provider)) {

		error = PTR_ERR(phy_provider);

		goto out_reg_disable;

	}



	error = cpcap_usb_init_optional_pins(ddata);

	if (error)

		return error;

		goto out_reg_disable;



	cpcap_usb_init_optional_gpios(ddata);



	error = cpcap_usb_init_iio(ddata);

	if (error)

		return error;

		goto out_reg_disable;



	error = cpcap_usb_init_interrupts(pdev, ddata);

	if (error)

		return error;

		goto out_reg_disable;



	usb_add_phy_dev(&ddata->phy);

	atomic_set(&ddata->active, 1);

	schedule_delayed_work(&ddata->detect_work, msecs_to_jiffies(1));



	return 0;



out_reg_disable:

	regulator_disable(ddata->vusb);



	return error;

}



static int cpcap_usb_phy_remove(struct platform_device *pdev)