Commit 8395ee62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy 

Pull phy fixes from Vinod Koul:
 "A bunch of odd driver fixes and a MAINTAINER email update:

   - Update Kishon's email

   - stms32 error code fix in driver probe

   - tegra: fix for checking valid pointer

   - qcom_qmp: null deref fix

   - sunplus: error check fix

   - ralink: add missing sentinel to table"

* tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: ralink: mt7621-pci: add sentinel to quirks table
  phy: sunplus: Fix an IS_ERR() vs NULL bug in sp_usb_phy_probe
  phy: qcom-qmp-combo: fix NULL-deref on runtime resume
  phy: tegra: xusb: Fix crash during pad power on/down
  phy: stm32: fix an error code in probe
  MAINTAINERS: Update Kishon's email address in GENERIC PHY FRAMEWORK
parents 17922865 819b885c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8602,8 +8602,8 @@ F: include/asm-generic/ 
F:	include/uapi/asm-generic/









GENERIC PHY FRAMEWORK









M:	Kishon Vijay Abraham I <kishon@ti.com>









M:	Vinod Koul <vkoul@kernel.org>









M:	Kishon Vijay Abraham I <kishon@kernel.org>









L:	linux-phy@lists.infradead.org









S:	Supported









Q:	https://patchwork.kernel.org/project/linux-phy/list/
































drivers/phy/qualcomm/phy-qcom-qmp-combo.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2240,7 +2240,7 @@ static void qmp_combo_enable_autonomous_mode(struct qmp_phy *qphy)







static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy)









{









	const struct qmp_phy_cfg *cfg = qphy->cfg;









	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs_usb;









	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;









	void __iomem *pcs_misc = qphy->pcs_misc;



















	/* Disable i/o clamp_n on resume for normal mode */
































drivers/phy/ralink/phy-mt7621-pci.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -280,7 +280,8 @@ static struct phy *mt7621_pcie_phy_of_xlate(struct device *dev,







}



















static const struct soc_device_attribute mt7621_pci_quirks_match[] = {









	{ .soc_id = "mt7621", .revision = "E2" }









	{ .soc_id = "mt7621", .revision = "E2" },









	{ /* sentinel */ }









};



















static const struct regmap_config mt7621_pci_phy_regmap_config = {
































drivers/phy/st/phy-stm32-usbphyc.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -710,6 +710,8 @@ static int stm32_usbphyc_probe(struct platform_device *pdev)







		ret = of_property_read_u32(child, "reg", &index);









		if (ret || index > usbphyc->nphys) {









			dev_err(&phy->dev, "invalid reg property: %d\n", ret);









			if (!ret)









				ret = -EINVAL;









			goto put_child;









		}










































drivers/phy/sunplus/phy-sunplus-usb2.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -256,8 +256,8 @@ static int sp_usb_phy_probe(struct platform_device *pdev)







	usbphy->moon4_res_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "moon4");









	usbphy->moon4_regs = devm_ioremap(&pdev->dev, usbphy->moon4_res_mem->start,









					  resource_size(usbphy->moon4_res_mem));









	if (IS_ERR(usbphy->moon4_regs))









		return PTR_ERR(usbphy->moon4_regs);









	if (!usbphy->moon4_regs)









		return -ENOMEM;



















	usbphy->phy_clk = devm_clk_get(&pdev->dev, NULL);









	if (IS_ERR(usbphy->phy_clk))