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

Commit f2051f8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD fixes from Lee Jones:
 "Received a copule of last minute fixes for v4.9.

  The patches from Viresh are fixing issues displayed in KernelCI"

* tag 'mfd-fixes-4.9.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: wm8994-core: Don't use managed regulator bulk get API
  mfd: wm8994-core: Disable regulators before removing them
  mfd: syscon: Support native-endian regmaps
parents ea9ea6c6 1a41741f

drivers/mfd/syscon.c

+3 −1
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static struct syscon *of_syscon_register(struct device_node *np) 
		syscon_config.val_format_endian = REGMAP_ENDIAN_BIG;

	else if (of_property_read_bool(np, "little-endian"))

		syscon_config.val_format_endian = REGMAP_ENDIAN_LITTLE;

	else if (of_property_read_bool(np, "native-endian"))

		syscon_config.val_format_endian = REGMAP_ENDIAN_NATIVE;



	/*

	 * search for reg-io-width property in DT. If it is not provided,

drivers/mfd/wm8994-core.c

+12 −4
Original line number Diff line number Diff line
@@ -394,7 +394,12 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
		goto err;

	}



	ret = devm_regulator_bulk_get(wm8994->dev, wm8994->num_supplies,

	/*

	 * Can't use devres helper here as some of the supplies are provided by

	 * wm8994->dev's children (regulators) and those regulators are

	 * unregistered by the devres core before the supplies are freed.

	 */

	ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,

				 wm8994->supplies);

	if (ret != 0) {

		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
@@ -405,7 +410,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
				    wm8994->supplies);

	if (ret != 0) {

		dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);

		goto err;

		goto err_regulator_free;

	}



	ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
@@ -596,6 +601,8 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
err_enable:

	regulator_bulk_disable(wm8994->num_supplies,

			       wm8994->supplies);

err_regulator_free:

	regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);

err:

	mfd_remove_devices(wm8994->dev);

	return ret;
@@ -604,10 +611,11 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
static void wm8994_device_exit(struct wm8994 *wm8994)

{

	pm_runtime_disable(wm8994->dev);

	mfd_remove_devices(wm8994->dev);

	wm8994_irq_exit(wm8994);

	regulator_bulk_disable(wm8994->num_supplies,

			       wm8994->supplies);

	regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);

	mfd_remove_devices(wm8994->dev);

}



static const struct of_device_id wm8994_of_match[] = {