Skip to content

Commit f970d1d

Browse files
committed
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
2 parents 7c53f6b + d092bd9 commit f970d1d

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

drivers/phy/ingenic/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-y += phy-ingenic-usb.o
2+
obj-$(CONFIG_PHY_INGENIC_USB) += phy-ingenic-usb.o

drivers/phy/mediatek/Kconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ config PHY_MTK_HDMI
4949

5050
config PHY_MTK_MIPI_DSI
5151
tristate "MediaTek MIPI-DSI Driver"
52-
depends on ARCH_MEDIATEK && OF
52+
depends on ARCH_MEDIATEK || COMPILE_TEST
53+
depends on COMMON_CLK
54+
depends on OF
5355
select GENERIC_PHY
5456
help
5557
Support MIPI DSI for Mediatek SoCs.

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -662,35 +662,42 @@ static int cpcap_usb_phy_probe(struct platform_device *pdev)
662662
generic_phy = devm_phy_create(ddata->dev, NULL, &ops);
663663
if (IS_ERR(generic_phy)) {
664664
error = PTR_ERR(generic_phy);
665-
return PTR_ERR(generic_phy);
665+
goto out_reg_disable;
666666
}
667667

668668
phy_set_drvdata(generic_phy, ddata);
669669

670670
phy_provider = devm_of_phy_provider_register(ddata->dev,
671671
of_phy_simple_xlate);
672-
if (IS_ERR(phy_provider))
673-
return PTR_ERR(phy_provider);
672+
if (IS_ERR(phy_provider)) {
673+
error = PTR_ERR(phy_provider);
674+
goto out_reg_disable;
675+
}
674676

675677
error = cpcap_usb_init_optional_pins(ddata);
676678
if (error)
677-
return error;
679+
goto out_reg_disable;
678680

679681
cpcap_usb_init_optional_gpios(ddata);
680682

681683
error = cpcap_usb_init_iio(ddata);
682684
if (error)
683-
return error;
685+
goto out_reg_disable;
684686

685687
error = cpcap_usb_init_interrupts(pdev, ddata);
686688
if (error)
687-
return error;
689+
goto out_reg_disable;
688690

689691
usb_add_phy_dev(&ddata->phy);
690692
atomic_set(&ddata->active, 1);
691693
schedule_delayed_work(&ddata->detect_work, msecs_to_jiffies(1));
692694

693695
return 0;
696+
697+
out_reg_disable:
698+
regulator_disable(ddata->vusb);
699+
700+
return error;
694701
}
695702

696703
static int cpcap_usb_phy_remove(struct platform_device *pdev)

0 commit comments

Comments
 (0)