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

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

Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator/clk fix from Mark Brown:
 "Fix s2mps11 build

  This patch fixes a build failure that appeared in v3.13-rc4 due to an
  RTC/MFD update merged via -mm"

* tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  mfd: s2mps11: Fix build after regmap field rename in sec-core.c
parents 941ef73d 1b1ccee1

drivers/clk/clk-s2mps11.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int s2mps11_clk_prepare(struct clk_hw *hw) 
	struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);

	int ret;



	ret = regmap_update_bits(s2mps11->iodev->regmap,

	ret = regmap_update_bits(s2mps11->iodev->regmap_pmic,

				S2MPS11_REG_RTC_CTRL,

				 s2mps11->mask, s2mps11->mask);

	if (!ret)
@@ -74,7 +74,7 @@ static void s2mps11_clk_unprepare(struct clk_hw *hw) 
	struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);

	int ret;



	ret = regmap_update_bits(s2mps11->iodev->regmap, S2MPS11_REG_RTC_CTRL,

	ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL,

			   s2mps11->mask, ~s2mps11->mask);



	if (!ret)
@@ -174,7 +174,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) 
		s2mps11_clk->hw.init = &s2mps11_clks_init[i];

		s2mps11_clk->mask = 1 << i;



		ret = regmap_read(s2mps11_clk->iodev->regmap,

		ret = regmap_read(s2mps11_clk->iodev->regmap_pmic,

				  S2MPS11_REG_RTC_CTRL, &val);

		if (ret < 0)

			goto err_reg;

drivers/regulator/s2mps11.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, s2mps11);



	config.dev = &pdev->dev;

	config.regmap = iodev->regmap;

	config.regmap = iodev->regmap_pmic;

	config.driver_data = s2mps11;

	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {

		if (!reg_np) {