File tree Expand file tree Collapse file tree 3 files changed +17
-8
lines changed Expand file tree Collapse file tree 3 files changed +17
-8
lines changed Original file line number Diff line number Diff line change 1
1
# SPDX-License-Identifier: GPL-2.0
2
- obj-y += phy-ingenic-usb.o
2
+ obj-$(CONFIG_PHY_INGENIC_USB) += phy-ingenic-usb.o
Original file line number Diff line number Diff line change @@ -49,7 +49,9 @@ config PHY_MTK_HDMI
49
49
50
50
config PHY_MTK_MIPI_DSI
51
51
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
53
55
select GENERIC_PHY
54
56
help
55
57
Support MIPI DSI for Mediatek SoCs.
Original file line number Diff line number Diff line change @@ -662,35 +662,42 @@ static int cpcap_usb_phy_probe(struct platform_device *pdev)
662
662
generic_phy = devm_phy_create (ddata -> dev , NULL , & ops );
663
663
if (IS_ERR (generic_phy )) {
664
664
error = PTR_ERR (generic_phy );
665
- return PTR_ERR ( generic_phy ) ;
665
+ goto out_reg_disable ;
666
666
}
667
667
668
668
phy_set_drvdata (generic_phy , ddata );
669
669
670
670
phy_provider = devm_of_phy_provider_register (ddata -> dev ,
671
671
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
+ }
674
676
675
677
error = cpcap_usb_init_optional_pins (ddata );
676
678
if (error )
677
- return error ;
679
+ goto out_reg_disable ;
678
680
679
681
cpcap_usb_init_optional_gpios (ddata );
680
682
681
683
error = cpcap_usb_init_iio (ddata );
682
684
if (error )
683
- return error ;
685
+ goto out_reg_disable ;
684
686
685
687
error = cpcap_usb_init_interrupts (pdev , ddata );
686
688
if (error )
687
- return error ;
689
+ goto out_reg_disable ;
688
690
689
691
usb_add_phy_dev (& ddata -> phy );
690
692
atomic_set (& ddata -> active , 1 );
691
693
schedule_delayed_work (& ddata -> detect_work , msecs_to_jiffies (1 ));
692
694
693
695
return 0 ;
696
+
697
+ out_reg_disable :
698
+ regulator_disable (ddata -> vusb );
699
+
700
+ return error ;
694
701
}
695
702
696
703
static int cpcap_usb_phy_remove (struct platform_device * pdev )
You can’t perform that action at this time.
0 commit comments