mirror of https://gitee.com/openkylin/linux.git
phy: second round of phy fixes for v5.11
- rockchip: init return and vednor prefix to dt-property - cpcap: bool conversion fix - lantiq: clock enable fix - lgm: kconfig depends on x86 - mediatek: add mising MODULE_DEVICE_TABLE() -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmAdMRgACgkQfBQHDyUj g0d0ag//RkMES7RoXcmaa2oAwNvRmX6PC04JjJnHJ8xlvOe/GQoRGhdH7oeXvPCv OeoOV0yfAa62AI5Vho+GF9xc31nWsus/UtH+VoxiqAZWLOx2xzKpFAPl1BVvIAHR V9msLtFwIAkb/wcB7coU5jGJKTdSwroFRpWLJcVJjNzzV8FKfZ+mpJm0tszyHRYq ohpkiQl2RmOjM3KmAQJ/F6z3f+ctXJz2fjwzKT0viza5Y78TTUllZwqrVWUxViGh iCyIKHHpRTIv1q2e0kxAIV1Q4z10Yt7+5cyFtEHDWU/LT7EuyG3LW65xcWi0Li7b LS+wgKEzS6Q39uTjruEdH5Neq5LdqkHcaOkEQDIDN33zHWbNeVgR3b5QNcg7cvA6 wp54YLZqa2NE75ec8jJ4LfguzYn48e3Qkvd63VviXJfYZ0QQfWQErLiRe97IWV1Q vW+Gvg1SQOa6oR++tVMe2qHy7hU/jCEJRBHGxlYMNj2yXSvvAgW5KRO4gC1YFswW +O+csDHRct/peskD5sT0gnOfoE0O92FZ7bYAwi5KnpwCat5z0j7SodiyOqEZlJyw Kvv9UX+aAj9S6UBEHb8sf9xzqi4dK+iSrubqb+47Nfuzxy/ZnywfN1NWtHKadHfd pSg5gOQs4v2wAzd0LJItWqle3bAPfs8GciK3cDH/6LLKyQSqNhc= =/v7w -----END PGP SIGNATURE----- Merge tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next Vinod writes: phy: second round of phy fixes for v5.11 - rockchip: init return and vednor prefix to dt-property - cpcap: bool conversion fix - lantiq: clock enable fix - lgm: kconfig depends on x86 - mediatek: add mising MODULE_DEVICE_TABLE() * tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: phy: mediatek: Add missing MODULE_DEVICE_TABLE() phy: phy-brcm-sata: remove unneeded semicolon phy: USB_LGM_PHY should depend on X86 phy: lantiq: rcu-usb2: wait after clock enable phy: rockchip: emmc, add vendor prefix to dts properties devicetree: phy: rockchip-emmc optional add vendor prefix phy: cpcap-usb: remove unneeded conversion to bool phy: rockchip-emmc: emmc_phy_init() always return 0
This commit is contained in:
commit
8e94114a40
|
@ -16,11 +16,11 @@ Optional properties:
|
||||||
- drive-impedance-ohm: Specifies the drive impedance in Ohm.
|
- drive-impedance-ohm: Specifies the drive impedance in Ohm.
|
||||||
Possible values are 33, 40, 50, 66 and 100.
|
Possible values are 33, 40, 50, 66 and 100.
|
||||||
If not set, the default value of 50 will be applied.
|
If not set, the default value of 50 will be applied.
|
||||||
- enable-strobe-pulldown: Enable internal pull-down for the strobe line.
|
- rockchip,enable-strobe-pulldown: Enable internal pull-down for the strobe
|
||||||
If not set, pull-down is not used.
|
line. If not set, pull-down is not used.
|
||||||
- output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
|
- rockchip,output-tapdelay-select: Specifies the phyctrl_otapdlysec register.
|
||||||
If not set, the register defaults to 0x4.
|
If not set, the register defaults to 0x4.
|
||||||
Maximum value 0xf.
|
Maximum value 0xf.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,7 @@ config PHY_XGENE
|
||||||
config USB_LGM_PHY
|
config USB_LGM_PHY
|
||||||
tristate "INTEL Lightning Mountain USB PHY Driver"
|
tristate "INTEL Lightning Mountain USB PHY Driver"
|
||||||
depends on USB_SUPPORT
|
depends on USB_SUPPORT
|
||||||
|
depends on X86 || COMPILE_TEST
|
||||||
select USB_PHY
|
select USB_PHY
|
||||||
select REGULATOR
|
select REGULATOR
|
||||||
select REGULATOR_FIXED_VOLTAGE
|
select REGULATOR_FIXED_VOLTAGE
|
||||||
|
|
|
@ -651,7 +651,7 @@ static int brcm_dsl_sata_init(struct brcm_sata_port *port)
|
||||||
break;
|
break;
|
||||||
msleep(20);
|
msleep(20);
|
||||||
try--;
|
try--;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (!try) {
|
if (!try) {
|
||||||
/* PLL did not lock; give up */
|
/* PLL did not lock; give up */
|
||||||
|
|
|
@ -124,8 +124,16 @@ static int ltq_rcu_usb2_phy_power_on(struct phy *phy)
|
||||||
reset_control_deassert(priv->phy_reset);
|
reset_control_deassert(priv->phy_reset);
|
||||||
|
|
||||||
ret = clk_prepare_enable(priv->phy_gate_clk);
|
ret = clk_prepare_enable(priv->phy_gate_clk);
|
||||||
if (ret)
|
if (ret) {
|
||||||
dev_err(dev, "failed to enable PHY gate\n");
|
dev_err(dev, "failed to enable PHY gate\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* at least the xrx200 usb2 phy requires some extra time to be
|
||||||
|
* operational after enabling the clock
|
||||||
|
*/
|
||||||
|
usleep_range(100, 200);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -201,6 +201,7 @@ static const struct of_device_id mtk_hdmi_phy_match[] = {
|
||||||
},
|
},
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, mtk_hdmi_phy_match);
|
||||||
|
|
||||||
static struct platform_driver mtk_hdmi_phy_driver = {
|
static struct platform_driver mtk_hdmi_phy_driver = {
|
||||||
.probe = mtk_hdmi_phy_probe,
|
.probe = mtk_hdmi_phy_probe,
|
||||||
|
|
|
@ -233,6 +233,7 @@ static const struct of_device_id mtk_mipi_tx_match[] = {
|
||||||
.data = &mt8183_mipitx_data },
|
.data = &mt8183_mipitx_data },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, mtk_mipi_tx_match);
|
||||||
|
|
||||||
static struct platform_driver mtk_mipi_tx_driver = {
|
static struct platform_driver mtk_mipi_tx_driver = {
|
||||||
.probe = mtk_mipi_tx_probe,
|
.probe = mtk_mipi_tx_probe,
|
||||||
|
|
|
@ -248,15 +248,17 @@ static int rockchip_emmc_phy_init(struct phy *phy)
|
||||||
* - SDHCI driver to get the PHY
|
* - SDHCI driver to get the PHY
|
||||||
* - SDHCI driver to init the PHY
|
* - SDHCI driver to init the PHY
|
||||||
*
|
*
|
||||||
* The clock is optional, so upon any error we just set to NULL.
|
* The clock is optional, using clk_get_optional() to get the clock
|
||||||
|
* and do error processing if the return value != NULL
|
||||||
*
|
*
|
||||||
* NOTE: we don't do anything special for EPROBE_DEFER here. Given the
|
* NOTE: we don't do anything special for EPROBE_DEFER here. Given the
|
||||||
* above expected use case, EPROBE_DEFER isn't sensible to expect, so
|
* above expected use case, EPROBE_DEFER isn't sensible to expect, so
|
||||||
* it's just like any other error.
|
* it's just like any other error.
|
||||||
*/
|
*/
|
||||||
rk_phy->emmcclk = clk_get(&phy->dev, "emmcclk");
|
rk_phy->emmcclk = clk_get_optional(&phy->dev, "emmcclk");
|
||||||
if (IS_ERR(rk_phy->emmcclk)) {
|
if (IS_ERR(rk_phy->emmcclk)) {
|
||||||
dev_dbg(&phy->dev, "Error getting emmcclk: %d\n", ret);
|
ret = PTR_ERR(rk_phy->emmcclk);
|
||||||
|
dev_err(&phy->dev, "Error getting emmcclk: %d\n", ret);
|
||||||
rk_phy->emmcclk = NULL;
|
rk_phy->emmcclk = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -380,10 +382,10 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
|
||||||
if (!of_property_read_u32(dev->of_node, "drive-impedance-ohm", &val))
|
if (!of_property_read_u32(dev->of_node, "drive-impedance-ohm", &val))
|
||||||
rk_phy->drive_impedance = convert_drive_impedance_ohm(pdev, val);
|
rk_phy->drive_impedance = convert_drive_impedance_ohm(pdev, val);
|
||||||
|
|
||||||
if (of_property_read_bool(dev->of_node, "enable-strobe-pulldown"))
|
if (of_property_read_bool(dev->of_node, "rockchip,enable-strobe-pulldown"))
|
||||||
rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_ENABLE;
|
rk_phy->enable_strobe_pulldown = PHYCTRL_REN_STRB_ENABLE;
|
||||||
|
|
||||||
if (!of_property_read_u32(dev->of_node, "output-tapdelay-select", &val)) {
|
if (!of_property_read_u32(dev->of_node, "rockchip,output-tapdelay-select", &val)) {
|
||||||
if (val <= PHYCTRL_OTAPDLYSEL_MAXVALUE)
|
if (val <= PHYCTRL_OTAPDLYSEL_MAXVALUE)
|
||||||
rk_phy->output_tapdelay_select = val;
|
rk_phy->output_tapdelay_select = val;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue