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

Commit 4aa34ce3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD fixes from Lee Jones:
 "Contained are some standard fixes and unusually an extension to the
  Reset API.  Some of those changes are required to fix a bug introduced
  in -rc1, which introduces extra 'reset line checks' i.e. whether the
  line is shared or not.  If a line is shared and the new *_shared() API
  is not used, the request fails with an error.  This breaks USB in v4.7
  for ST's platforms.

  Admittedly, there are some patches contained in our (MFD/Reset)
  immutable branch which are not true -fixes, but there isn't anything I
  can do about that.  Rest assured though, there aren't any API
  'changes'.  Everything is the same from the consumer's perspective.

   - Use new reset_*_get_shared() variant to prevent reset line
     obtainment failure (Fixes commit 0b52297f: "reset: Add support
     for shared reset controls")

   - Fix unintentional switch() fall-through into error path

   - Fix uninitialised variable compiler warning"

* tag 'mfd-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: da9053: Fix compiler warning message for uninitialised variable
  mfd: max77620: Fix FPS switch statements
  phy: phy-stih407-usb: Inform the reset framework that our reset line may be shared
  usb: dwc3: st: Inform the reset framework that our reset line may be shared
  usb: host: ehci-st: Inform the reset framework that our reset line may be shared
  usb: host: ohci-st: Inform the reset framework that our reset line may be shared
  reset: TRIVIAL: Add line break at same place for similar APIs
  reset: Supply *_shared variant calls when using *_optional APIs
  reset: Supply *_shared variant calls when using of_* API
  reset: Ensure drivers are explicit when requesting reset lines
  reset: Reorder inline reset_control_get*() wrappers
parents e7bdea77 ba4a1c28

drivers/mfd/max77620.c

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static int max77620_get_fps_period_reg_value(struct max77620_chip *chip, 
		break;

	case MAX77620:

		fps_min_period = MAX77620_FPS_PERIOD_MIN_US;

		break;

	default:

		return -EINVAL;

	}
@@ -236,6 +237,7 @@ static int max77620_config_fps(struct max77620_chip *chip, 
		break;

	case MAX77620:

		fps_max_period = MAX77620_FPS_PERIOD_MAX_US;

		break;

	default:

		return -EINVAL;

	}

drivers/phy/phy-stih407-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev) 
	phy_dev->dev = dev;

	dev_set_drvdata(dev, phy_dev);



	phy_dev->rstc = devm_reset_control_get(dev, "global");

	phy_dev->rstc = devm_reset_control_get_shared(dev, "global");

	if (IS_ERR(phy_dev->rstc)) {

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

		return PTR_ERR(phy_dev->rstc);

drivers/usb/dwc3/dwc3-st.c

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ static int st_dwc3_probe(struct platform_device *pdev) 
	/* Manage PowerDown */

	reset_control_deassert(dwc3_data->rstc_pwrdn);



	dwc3_data->rstc_rst = devm_reset_control_get(dev, "softreset");

	dwc3_data->rstc_rst =

		devm_reset_control_get_shared(dev, "softreset");

	if (IS_ERR(dwc3_data->rstc_rst)) {

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

		ret = PTR_ERR(dwc3_data->rstc_rst);

drivers/usb/host/ehci-st.c

+4 −2
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ static int st_ehci_platform_probe(struct platform_device *dev) 
		priv->clk48 = NULL;

	}



	priv->pwr = devm_reset_control_get_optional(&dev->dev, "power");

	priv->pwr =

		devm_reset_control_get_optional_shared(&dev->dev, "power");

	if (IS_ERR(priv->pwr)) {

		err = PTR_ERR(priv->pwr);

		if (err == -EPROBE_DEFER)
@@ -214,7 +215,8 @@ static int st_ehci_platform_probe(struct platform_device *dev) 
		priv->pwr = NULL;

	}



	priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset");

	priv->rst =

		devm_reset_control_get_optional_shared(&dev->dev, "softreset");

	if (IS_ERR(priv->rst)) {

		err = PTR_ERR(priv->rst);

		if (err == -EPROBE_DEFER)

drivers/usb/host/ohci-st.c

+4 −2
Original line number Diff line number Diff line
@@ -188,13 +188,15 @@ static int st_ohci_platform_probe(struct platform_device *dev) 
		priv->clk48 = NULL;

	}



	priv->pwr = devm_reset_control_get_optional(&dev->dev, "power");

	priv->pwr =

		devm_reset_control_get_optional_shared(&dev->dev, "power");

	if (IS_ERR(priv->pwr)) {

		err = PTR_ERR(priv->pwr);

		goto err_put_clks;

	}



	priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset");

	priv->rst =

		devm_reset_control_get_optional_shared(&dev->dev, "softreset");

	if (IS_ERR(priv->rst)) {

		err = PTR_ERR(priv->rst);

		goto err_put_clks;