phy: fixes for 5.10

Bunch of fixes for phy drivers:
 *) USB phy incorrect clearing of bits
 *) Tegra xusb dangling pointer
 *) qcom-qmp null ptr initialization
 *) cpcap-usb irq flags
 *) intel kkembay kconfig depends
 *) qualcomm OF dependency
 *) mediatek typo
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAl+311cACgkQfBQHDyUj
 g0dObg/+NkLD7j9FX61vYkGecNbHeVFgXeAH6yDvZJfSP0OEoKCEyUcleO2C5f3L
 Pndb8gLsyEiCHFsif0FxW+kOp0Rg4E+1/JoigWnS8m2A8LCPNbwATcnNnSyoAFAZ
 opYq29CVeU3u/jpWlTFOuyZv1BIXYgHg7dol3izLapT8/jPuHLSaE7i97X/w5clx
 s9iZDcgDY+Q4bVmbBhoY+5CqBnUfiYVFMSnxIYkperxkuiVCTXvcZCYgJtTf7EM7
 ASYcAPTgcL9XyeRXCvKMUJm5LCvjOkG4dTDhPMBZNaIZbr9wHLkqWKAeiqGZnHvK
 kttKm2v1cOMOt9oSuGxbjZ8BKrk6NsOKTvPO54HIQnDQk8UOdNhKnROtJRaumoR3
 71thLAAKEQAGu/CivF9kgDdQOx1b7L2xveuxfq1Mc5jrjpjnrxmL1qhp5mSHoPaJ
 5yG+gZ+2inuBLGXpvxyLL00v2ns8kai9UC8GsM+bmaQgdJqe7etkFjkFW2onOPUr
 u+4aPCnDDFKxYPz84JFi85o3eGtmfZxYc2+B7KHqPF9hpLi+xSq3qGnskVLrJkKo
 NXfhQN/EqUjn9GNNZPUAnOmWoJzO0b52vZW35wD1O63/fk3kpnHd9mMwY53F6/iK
 zrCbA5d5VWiTrIfI4oUB3Cg6h3uAJgiyPiGbtUHj8FKi4iZR4nE=
 =fnN3
 -----END PGP SIGNATURE-----

Merge tag 'phy-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into usb-linus

Vinod writes:

phy: fixes for 5.10

Bunch of fixes for phy drivers:
*) USB phy incorrect clearing of bits
*) Tegra xusb dangling pointer
*) qcom-qmp null ptr initialization
*) cpcap-usb irq flags
*) intel kkembay kconfig depends
*) qualcomm OF dependency
*) mediatek typo

* tag 'phy-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version"
  phy: qualcomm: Fix 28 nm Hi-Speed USB PHY OF dependency
  phy: qualcomm: usb: Fix SuperSpeed PHY OF dependency
  phy: intel: PHY_INTEL_KEEMBAY_EMMC should depend on ARCH_KEEMBAY
  phy: cpcap-usb: Use IRQF_ONESHOT
  phy: qcom-qmp: Initialize another pointer to NULL
  phy: tegra: xusb: Fix dangling pointer on probe failure
  phy: usb: Fix incorrect clearing of tca_drv_sel bit in SETUP reg for 7211
This commit is contained in:
Greg Kroah-Hartman 2020-11-20 16:28:48 +01:00
commit 7c8011dd8c
7 changed files with 8 additions and 11 deletions

View File

@ -270,11 +270,6 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params)
reg |= params->mode << USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT;
brcm_usb_writel(reg, usb_phy + USB_PHY_UTMI_CTL_1);
/* Fix the incorrect default */
reg = brcm_usb_readl(ctrl + USB_CTRL_SETUP);
reg &= ~USB_CTRL_SETUP_tca_drv_sel_MASK;
brcm_usb_writel(reg, ctrl + USB_CTRL_SETUP);
usb_init_common(params);
/*

View File

@ -4,7 +4,7 @@
#
config PHY_INTEL_KEEMBAY_EMMC
tristate "Intel Keem Bay EMMC PHY driver"
depends on (OF && ARM64) || COMPILE_TEST
depends on ARCH_KEEMBAY || COMPILE_TEST
depends on HAS_IOMEM
select GENERIC_PHY
select REGMAP_MMIO

View File

@ -12,7 +12,7 @@ config PHY_MTK_TPHY
it supports multiple usb2.0, usb3.0 ports, PCIe and
SATA, and meanwhile supports two version T-PHY which have
different banks layout, the T-PHY with shared banks between
multi-ports is first version, otherwise is second veriosn,
multi-ports is first version, otherwise is second version,
so you can easily distinguish them by banks layout.
config PHY_MTK_UFS

View File

@ -364,7 +364,8 @@ static int cpcap_usb_init_irq(struct platform_device *pdev,
error = devm_request_threaded_irq(ddata->dev, irq, NULL,
cpcap_phy_irq_thread,
IRQF_SHARED,
IRQF_SHARED |
IRQF_ONESHOT,
name, ddata);
if (error) {
dev_err(ddata->dev, "could not get irq %s: %i\n",

View File

@ -87,7 +87,7 @@ config PHY_QCOM_USB_HSIC
config PHY_QCOM_USB_HS_28NM
tristate "Qualcomm 28nm High-Speed PHY"
depends on ARCH_QCOM || COMPILE_TEST
depends on OF && (ARCH_QCOM || COMPILE_TEST)
depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in
select GENERIC_PHY
help
@ -98,7 +98,7 @@ config PHY_QCOM_USB_HS_28NM
config PHY_QCOM_USB_SS
tristate "Qualcomm USB Super-Speed PHY driver"
depends on ARCH_QCOM || COMPILE_TEST
depends on OF && (ARCH_QCOM || COMPILE_TEST)
depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in
select GENERIC_PHY
help

View File

@ -3926,7 +3926,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
struct phy_provider *phy_provider;
void __iomem *serdes;
void __iomem *usb_serdes;
void __iomem *dp_serdes;
void __iomem *dp_serdes = NULL;
const struct qmp_phy_combo_cfg *combo_cfg = NULL;
const struct qmp_phy_cfg *cfg = NULL;
const struct qmp_phy_cfg *usb_cfg = NULL;

View File

@ -1242,6 +1242,7 @@ power_down:
reset:
reset_control_assert(padctl->rst);
remove:
platform_set_drvdata(pdev, NULL);
soc->ops->remove(padctl);
return err;
}