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

Commit 0d064a7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-4.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull more MFD fixes from Lee Jones:
 "Apologies for missing these from the first pull request.

  Final patches fixing Reset API change"

* tag 'mfd-fixes-4.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  usb: dwc3: st: Use explicit reset_control_get_exclusive() API
  phy: phy-stih407-usb: Use explicit reset_control_get_exclusive() API
  phy: miphy28lp: Inform the reset framework that our reset line may be shared
parents f3683ccd 5baaf3b9

drivers/phy/phy-miphy28lp.c

+2 −1
Original line number Diff line number Diff line
@@ -1143,7 +1143,8 @@ static int miphy28lp_probe_resets(struct device_node *node, 
	struct miphy28lp_dev *miphy_dev = miphy_phy->phydev;

	int err;



	miphy_phy->miphy_rst = of_reset_control_get(node, "miphy-sw-rst");

	miphy_phy->miphy_rst =

		of_reset_control_get_shared(node, "miphy-sw-rst");



	if (IS_ERR(miphy_phy->miphy_rst)) {

		dev_err(miphy_dev->dev,

drivers/phy/phy-stih407-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev) 
		return PTR_ERR(phy_dev->rstc);

	}



	phy_dev->rstport = devm_reset_control_get(dev, "port");

	phy_dev->rstport = devm_reset_control_get_exclusive(dev, "port");

	if (IS_ERR(phy_dev->rstport)) {

		dev_err(dev, "failed to ctrl picoPHY reset\n");

		return PTR_ERR(phy_dev->rstport);

drivers/usb/dwc3/dwc3-st.c

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ static int st_dwc3_probe(struct platform_device *pdev) 
	dev_vdbg(&pdev->dev, "glue-logic addr 0x%p, syscfg-reg offset 0x%x\n",

		 dwc3_data->glue_base, dwc3_data->syscfg_reg_off);



	dwc3_data->rstc_pwrdn = devm_reset_control_get(dev, "powerdown");

	dwc3_data->rstc_pwrdn =

		devm_reset_control_get_exclusive(dev, "powerdown");

	if (IS_ERR(dwc3_data->rstc_pwrdn)) {

		dev_err(&pdev->dev, "could not get power controller\n");

		ret = PTR_ERR(dwc3_data->rstc_pwrdn);