korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

phy: fixes for 5.11

Browse Source 
*) Fix Ingenic driver build
 *) Warning fix for cpcap-usb
 *) Compile test enabling for mediatek phy
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAl/5bpEACgkQfBQHDyUj
 g0fzBhAAnIrwrV6A+vfTKiuzfPNI4ugTPpc0bilqI9WVAQ14kE4tvhyRv3RCmFSo
 oQlOm0e5q/ngOnRNCESLuVZosXu0y4qDyfCbTdNtTTVjCLsfNpqXPIvOPLJQd77l
 J/kPiyaLVpypU4QOfr/Y2vASzS5PDOcbp1LoU1VTnO+AHgEWlfBFXmuFeJrJsFGG
 ALla0aAw4uipzRacZwBnsaletMb8tC0cTAD7vLIy9jjMSNfPlQ/ZDORBmUfCrwAm
 injOrOpP0X6jrQUiSK8/zfZaiSA6Fqeq+yo4SKXKnb7ykfSjt2a/yzz2yj5jUjhy
 NrbGWoyxdvhI+W2zY5xjQfPDsNTKeYtkh5MzLoXlSjhT/2OFTopC1Pwla2hjhqF4
 fE9AjZlQsgcReWLW2HKY4TxuWsB09KHSKIaSOwGMrk9d/dIv1od74ZFA/L0Isv2h
 WMpxa2W2aurs8I9Xe/m6CTJtv9Mhufr7M8TrGdGJTPyB4kO3iz4Xds47U6urjKly
 0cQx6rDqZIt/1b7uQYrKScPyXVSdHy2mcgdwFqgN1kKDITwKPXDeIBstJaixq3Nx
 eQF/MKWDzhsCpQXWnB1uA3ye/cIULEj5zbWpM+CfSmHx4Fhk7Ndea7f9BdcKY4/7
 k21zc+WRf/Dzw7uIy/ER2v4f9bmaAqBgsGnZkmTErd0V5tTiLQE=
 =vbxw
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2021-01-11 15:37:40 +01:00
commit f970d1d01a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/phy/ingenic/Makefile
View File

@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += phy-ingenic-usb.o
obj-$(CONFIG_PHY_INGENIC_USB) += phy-ingenic-usb.o

4
drivers/phy/mediatek/Kconfig
View File

@ -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.

19
drivers/phy/motorola/phy-cpcap-usb.c
View File

@ -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)