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

Commit dc414a22 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: phy: qmp: Make AHB2PHY register requirement optional"

parents 520d1e12 2b13c0f5

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

+3 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ Required properties: 
 - reg: Address and length of the register set for the device

   Required regs are:

   "qmp_phy_base" : QMP PHY Base register set.

   "qmp_ahb2phy_base" : SS AHB2PHY CSR register set.

 - <supply-name>-supply: phandle to the regulator device tree node

   Required "supply-name" examples are:

	"vdd" : vdd supply for SSPHY digital circuit operation
@@ -100,6 +99,8 @@ Required properties: 
   microvolts or a value corresponding to voltage corner



Optional properties:

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

  "qmp_ahb2phy_base" : SS AHB2PHY CSR register set.

- qcom,vbus-valid-override: If present, indicates VBUS pin is not connected to

   the USB PHY and the controller must rely on external VBUS notification in

   order to manually relay the notification to the SSPHY.

drivers/usb/phy/phy-msm-ssusb-qmp.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int msm_ssphy_qmp_probe(struct platform_device *pdev) 
	phy->ahb2phy = devm_ioremap_resource(dev, res);

	if (IS_ERR(phy->ahb2phy)) {

		dev_err(dev, "couldn't find qmp_ahb2phy_base address.\n");

		return PTR_ERR(phy->ahb2phy);

		phy->ahb2phy = NULL;

	}



	ret = of_property_read_u32_array(dev->of_node, "qcom,vdd-voltage-level",