All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Axel Lin <axel.lin@gmail.com>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Dong Aisheng <dong.aisheng@linaro.org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree
Date: Tue, 18 Sep 2012 13:19:04 +1000	[thread overview]
Message-ID: <20120918131904.ded0551cb03d079dc08cecbb@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/regulator/anatop-regulator.c between commit 3e2a928472da
("regulator: anatop: Fix wrong mask used in anatop_get_voltage_sel") from
Linus' tree and commit baa64151aecc ("regulator: anatop-regulator:
Convert to use syscon to access anatop register") from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/regulator/anatop-regulator.c
index ce0fe72,596535d..0000000
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@@ -61,18 -64,17 +64,18 @@@ static int anatop_regmap_set_voltage_se
  	return 0;
  }
  
- static int anatop_get_voltage_sel(struct regulator_dev *reg)
+ static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
  {
  	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
 -	u32 val;
 +	u32 val, mask;
  
  	if (!anatop_reg->control_reg)
  		return -ENOTSUPP;
  
- 	val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg);
+ 	regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val);
 -	val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >>
 +	mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
  		anatop_reg->vol_bit_shift;
 +	val = (val & mask) >> anatop_reg->vol_bit_shift;
  
  	return val - anatop_reg->min_bit_val;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-09-18  3:19 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-18  3:19 Stephen Rothwell [this message]
2012-09-18  7:31 ` linux-next: manual merge of the mfd tree with Linus' tree Dong Aisheng
  -- strict thread matches above, loose matches on Subject: below --
2023-03-05 22:49 Stephen Rothwell
2019-06-11  4:31 Stephen Rothwell
2019-05-09  2:44 Stephen Rothwell
2019-02-08  2:37 Stephen Rothwell
2019-02-08  8:33 ` Jarkko Nikula
2018-08-17  0:39 Stephen Rothwell
2018-08-21  8:08 ` Geert Uytterhoeven
2018-08-21  8:30   ` Stephen Rothwell
2018-08-28 13:34     ` Geert Uytterhoeven
2018-08-28 21:45       ` Stephen Rothwell
2018-03-08  1:33 Stephen Rothwell
2018-03-08  8:12 ` Lee Jones
2014-11-13  1:47 Stephen Rothwell
2012-11-28  3:20 Stephen Rothwell
2012-10-03  4:12 Stephen Rothwell
2012-09-12  2:49 Stephen Rothwell
2012-07-25  1:18 Stephen Rothwell
2012-07-25  6:40 ` Laxman Dewangan
2012-05-23  3:01 Stephen Rothwell
2012-05-22  4:14 Stephen Rothwell
2012-05-22  4:10 Stephen Rothwell
2012-03-23  3:32 Stephen Rothwell
2012-03-23  9:41 ` Samuel Ortiz
2012-03-24 17:31   ` Grant Likely
2012-03-26  8:25     ` Samuel Ortiz
2012-03-28 22:47       ` Grant Likely
2012-01-12  1:06 Stephen Rothwell
2011-09-09  4:22 Stephen Rothwell
2011-03-21  1:26 Stephen Rothwell
2011-03-21  8:21 ` Linus Walleij
2011-03-22 11:16   ` Samuel Ortiz
2011-03-23 17:57     ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2010-09-13  1:54 Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz
2010-08-12  4:41 Stephen Rothwell
2010-08-12  9:51 ` Samuel Ortiz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120918131904.ded0551cb03d079dc08cecbb@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=axel.lin@gmail.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dong.aisheng@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.