Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8889114 authored by Vamsi Krishna Samavedam's avatar Vamsi Krishna Samavedam
Browse files

usb: phy: snps: Do not use rext if efuse is programmed 



Do not use external resistor if phy parameter is programmed/calibrated
using efuse.

Change-Id: Ib26358320b5f3edf4f5359d44549f52e27c618da
Signed-off-by: default avatarVamsi Krishna Samavedam <vskrishn@codeaurora.org>
parent dfb894c5

Documentation/devicetree/bindings/usb/qcom,msm-phy.txt

+6 −1
Original line number Diff line number Diff line
@@ -25,7 +25,12 @@ Required properties: 
   property.



Optional properties:

 - qcom,param-override-seq: parameter override sequence with value, reg offset pair.

 - qcom,param-override-seq: parameter override sequence with value, reg offset

   pair.

 - qcom,rcal-mask: efuse calibration mask.

 - reg: Address and length of the register set for the device

   Optional regs are:

        "phy_rcal_reg": register address for efuse used for rext calibration



Example:

	hsphy@f9200000 {

drivers/usb/phy/phy-msm-snps-hs.c

+32 −1
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ struct msm_hsphy { 
	int			*param_override_seq;

	int			param_override_seq_cnt;



	void __iomem		*phy_rcal_reg;

	u32			rcal_mask;



	/* emulation targets specific */

	void __iomem		*emu_phy_base;

	int			*emu_init_seq;
@@ -357,6 +360,7 @@ static int msm_hsphy_init(struct usb_phy *uphy) 
{

	struct msm_hsphy *phy = container_of(uphy, struct msm_hsphy, phy);

	int ret;

	u32 rcal_code = 0;



	dev_dbg(uphy->dev, "%s\n", __func__);
@@ -393,6 +397,15 @@ static int msm_hsphy_init(struct usb_phy *uphy) 
		hsusb_phy_write_seq(phy->base, phy->param_override_seq,

				phy->param_override_seq_cnt, 0);



	if (phy->phy_rcal_reg) {

		rcal_code = readl_relaxed(phy->phy_rcal_reg) & phy->rcal_mask;



		dev_dbg(uphy->dev, "rcal_mask:%08x reg:%08x code:%08x\n",

				phy->rcal_mask, phy->phy_rcal_reg, rcal_code);

	}



	/* Use external resistor for tuning if efuse is not programmed */

	if (!rcal_code)

		msm_usb_write_readback(phy->base, USB2PHY_USB_PHY_RTUNE_SEL,

			RTUNE_SEL, RTUNE_SEL);
@@ -512,6 +525,24 @@ static int msm_hsphy_probe(struct platform_device *pdev) 
		goto err_ret;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

							"phy_rcal_reg");

	if (res) {

		phy->phy_rcal_reg = devm_ioremap_nocache(dev,

					res->start, resource_size(res));

		if (IS_ERR(phy->phy_rcal_reg)) {

			dev_err(dev, "couldn't ioremap phy_rcal_reg\n");

			phy->phy_rcal_reg = NULL;

		}

		if (of_property_read_u32(dev->of_node,

					"qcom,rcal-mask", &phy->rcal_mask)) {

			dev_err(dev, "unable to read phy rcal mask\n");

			phy->phy_rcal_reg = NULL;

		}

		dev_dbg(dev, "rcal_mask:%08x reg:%08x\n", phy->rcal_mask,

				phy->phy_rcal_reg);

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

							"emu_phy_base");

	if (res) {