linux-next: manual merge of the mfd tree with Linus' tree

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  drivers/mfd/Kconfig

between commit:

  9baddb61dfec ("mfd: Fix unmet dependency warning for MFD_TPS68470")

from Linus' tree and commit:

  09fdc9857712 ("mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies")

from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/mfd/Kconfig
index 76f9909cf396,f38f8741c68e..000000000000
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -1419,10 -1419,10 +1419,10 @@@ config MFD_TPS6521
  
  config MFD_TPS68470
  	bool "TI TPS68470 Power Management / LED chips"
 -	depends on ACPI && I2C=y
 +	depends on ACPI && PCI && I2C=y
+ 	depends on I2C_DESIGNWARE_PLATFORM=y
  	select MFD_CORE
  	select REGMAP_I2C
- 	select I2C_DESIGNWARE_PLATFORM
  	help
  	  If you say yes here you get support for the TPS68470 series of
  	  Power Management / LED chips.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Jarkko Nikula]

On 2/8/19 4:37 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>    drivers/mfd/Kconfig
> 
> between commit:
> 
>    9baddb61dfec ("mfd: Fix unmet dependency warning for MFD_TPS68470")
> 
> from Linus' tree and commit:
> 
>    09fdc9857712 ("mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies")
> 
> from the mfd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
Thanks, that's is the right fix for the conflict.

-- 
Jarkko

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  Documentation/devicetree/bindings/mfd/syscon.yaml

between commit:

  c2e322ae9f06 ("dt-bindings: soc: samsung: exynos-sysreg: split from syscon")

from Linus' tree and commit:

  30e885bbcf29 ("dt-bindings: mfd: syscon: Add StarFive JH7100 sysmain compatible")

from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/mfd/syscon.yaml
index c828c4f5e4a7,ded70830d91e..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -67,6 -67,13 +67,7 @@@ properties
                - rockchip,rk3568-qos
                - rockchip,rk3588-qos
                - rockchip,rv1126-qos
 -              - samsung,exynos3-sysreg
 -              - samsung,exynos4-sysreg
 -              - samsung,exynos5-sysreg
 -              - samsung,exynos5433-sysreg
 -              - samsung,exynos850-sysreg
 -              - samsung,exynosautov9-sysreg
+               - starfive,jh7100-sysmain
  
            - const: syscon
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  include/linux/mfd/cros_ec_commands.h

between commit:

  9c92ab619141 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282")

from Linus' tree and commit:

  2769bd79a915 ("mfd: cros_ec: Update license term")

from the mfd tree.

I fixed it up (I use the SPDX tag from the former and the later change
to the comment from the latter) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  MAINTAINERS

between commit:

  10b5d3d10759 ("MAINTAINERS: add maintainer for maxbotix ultrasonic driver")

from Linus' tree and commit:

  796fad0101d3 ("MAINTAINERS: Add an entry for MAX77650 PMIC driver")

from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 77471dd6cb46,1effe9789023..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9521,13 -9414,20 +9527,27 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/sound/max9860.txt
  F:	sound/soc/codecs/max9860.*
  
 +MAXBOTIX ULTRASONIC RANGER IIO DRIVER
 +M:	Andreas Klinger <ak@it-klinger.de>
 +L:	linux-iio@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:	drivers/iio/proximity/mb1232.c
 +
+ MAXIM MAX77650 PMIC MFD DRIVER
+ M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ L:	linux-kernel@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/*/*max77650.txt
+ F:	Documentation/devicetree/bindings/*/max77650*.txt
+ F:	include/linux/mfd/max77650.h
+ F:	drivers/mfd/max77650.c
+ F:	drivers/regulator/max77650-regulator.c
+ F:	drivers/power/supply/max77650-charger.c
+ F:	drivers/input/misc/max77650-onkey.c
+ F:	drivers/leds/leds-max77650.c
+ F:	drivers/gpio/gpio-max77650.c
+ 
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:	Javier Martinez Canillas <javier@dowhile0.org>
  L:	linux-kernel@vger.kernel.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  MAINTAINERS

between commit:

  16b7db4c8150 ("MAINTAINERS: Add .clang-format entry")

from Linus' tree and commit:

  97c2b5cba204 ("mfd: madera: Add register definitions for Cirrus Logic Madera codecs")

from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 041b111596bc,2c1c6aef7d74..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3557,11 -3513,23 +3557,27 @@@ M:	Christian Benvenuti <benve@cisco.com
  S:	Supported
  F:	drivers/infiniband/hw/usnic/
  
 +CLANG-FORMAT FILE
 +M:	Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
 +S:	Maintained
 +F:	.clang-format
 +
+ CIRRUS LOGIC MADERA CODEC DRIVERS
+ M:	Charles Keepax <ckeepax@opensource.cirrus.com>
+ M:	Richard Fitzgerald <rf@opensource.cirrus.com>
+ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
+ L:	patches@opensource.cirrus.com
+ T:	git https://github.com/CirrusLogic/linux-drivers.git
+ W:	https://github.com/CirrusLogic/linux-drivers/wiki
+ S:	Supported
+ F:	Documentation/devicetree/bindings/mfd/madera.txt
+ F:	Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+ F:	include/linux/mfd/madera/*
+ F:	drivers/gpio/gpio-madera*
+ F:	drivers/mfd/madera*
+ F:	drivers/mfd/cs47l*
+ F:	drivers/pinctrl/cirrus/*
+ 
  CLEANCACHE API
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:	linux-kernel@vger.kernel.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Geert Uytterhoeven]

On Fri, Aug 17, 2018 at 2:40 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the mfd tree got a conflict in:
>
>   MAINTAINERS
>
> between commit:
>
>   16b7db4c8150 ("MAINTAINERS: Add .clang-format entry")
>
> from Linus' tree and commit:
>
>   97c2b5cba204 ("mfd: madera: Add register definitions for Cirrus Logic Madera codecs")
>
> from the mfd tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index 041b111596bc,2c1c6aef7d74..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -3557,11 -3513,23 +3557,27 @@@ M:   Christian Benvenuti <benve@cisco.com
>   S:    Supported
>   F:    drivers/infiniband/hw/usnic/
>
>  +CLANG-FORMAT FILE
>  +M:    Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
>  +S:    Maintained
>  +F:    .clang-format
>  +
> + CIRRUS LOGIC MADERA CODEC DRIVERS

To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG
entry.
Upon closer look, it should be inserted before the CISCO entries, too (in
the mfd tree).

> + M:    Charles Keepax <ckeepax@opensource.cirrus.com>
> + M:    Richard Fitzgerald <rf@opensource.cirrus.com>
> + L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
> + L:    patches@opensource.cirrus.com
> + T:    git https://github.com/CirrusLogic/linux-drivers.git
> + W:    https://github.com/CirrusLogic/linux-drivers/wiki
> + S:    Supported
> + F:    Documentation/devicetree/bindings/mfd/madera.txt
> + F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
> + F:    include/linux/mfd/madera/*
> + F:    drivers/gpio/gpio-madera*
> + F:    drivers/mfd/madera*
> + F:    drivers/mfd/cs47l*
> + F:    drivers/pinctrl/cirrus/*
> +
>   CLEANCACHE API
>   M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>   L:    linux-kernel@vger.kernel.org


Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Geert,

On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG
> entry.
> Upon closer look, it should be inserted before the CISCO entries, too (in
> the mfd tree).

Thanks for noticing.  Unfortunately it is badly ordered in Linus' tree
now as well.  Feel like sending him a patch?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Geert Uytterhoeven]

Hi Stephen,

On Tue, Aug 21, 2018 at 10:31 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG
> > entry.
> > Upon closer look, it should be inserted before the CISCO entries, too (in
> > the mfd tree).
>
> Thanks for noticing.  Unfortunately it is badly ordered in Linus' tree
> now as well.  Feel like sending him a patch?

Your wish is my command; sent.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Geert,

On Tue, 28 Aug 2018 15:34:38 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> On Tue, Aug 21, 2018 at 10:31 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:  
> > > To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG
> > > entry.
> > > Upon closer look, it should be inserted before the CISCO entries, too (in
> > > the mfd tree).  
> >
> > Thanks for noticing.  Unfortunately it is badly ordered in Linus' tree
> > now as well.  Feel like sending him a patch?  
> 
> Your wish is my command; sent.

:-)

Thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Lee,

Today's linux-next merge of the mfd tree got a conflict in:

  drivers/mfd/syscon.c

between commit:

  3bafc09e7797 ("mfd: syscon: Add hardware spinlock support")

from Linus' tree and commit:

  34c90dcce6b1 ("mfd: syscon: Set regmap name to DT node name")

from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/mfd/syscon.c
index 7eaa40bc703f,2c34a356a6a9..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -88,24 -87,7 +88,25 @@@ static struct syscon *of_syscon_registe
  	if (ret)
  		reg_io_width = 4;
  
 +	ret = of_hwspin_lock_get_id(np, 0);
 +	if (ret > 0 || (IS_ENABLED(CONFIG_HWSPINLOCK) && ret == 0)) {
 +		syscon_config.use_hwlock = true;
 +		syscon_config.hwlock_id = ret;
 +		syscon_config.hwlock_mode = HWLOCK_IRQSTATE;
 +	} else if (ret < 0) {
 +		switch (ret) {
 +		case -ENOENT:
 +			/* Ignore missing hwlock, it's optional. */
 +			break;
 +		default:
 +			pr_err("Failed to retrieve valid hwlock: %d\n", ret);
 +			/* fall-through */
 +		case -EPROBE_DEFER:
 +			goto err_regmap;
 +		}
 +	}
 +
+ 	syscon_config.name = of_node_full_name(np);
  	syscon_config.reg_stride = reg_io_width;
  	syscon_config.val_bits = reg_io_width * 8;
  	syscon_config.max_register = resource_size(&res) - reg_io_width;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Lee Jones]

On Thu, 08 Mar 2018, Stephen Rothwell wrote:

> Hi Lee,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/mfd/syscon.c
> 
> between commit:
> 
>   3bafc09e7797 ("mfd: syscon: Add hardware spinlock support")
> 
> from Linus' tree and commit:
> 
>   34c90dcce6b1 ("mfd: syscon: Set regmap name to DT node name")
> 
> from the mfd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Now fixed in my tree.  You may withdraw your patch.

Thanks Stephen.

-- 
Lee Jones
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Lee,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/viperboard.c between commit b6684228726c ("mfd: viperboard:
Fix platform-device id collision") from Linus' tree and commit
5e65ea8c48e6 ("mfd: Use mfd_add_hotplug_devices() helper") from the mfd
tree.

I fixed it up (I just used the version from the mfd tree) and can carry
the fix as necessary (no action is required).

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/twl-core.c between commit 78a3c5ab1749 ("mfd: twl-core: Fix
chip ID for the twl6030-pwm module") from Linus' tree and commit
afc45898f62c ("mfd: twl-core: Support for proper PWM drivers") from the
mfd tree.

I fixed it up (using the version from the mfd tree) and can carry the fix
as necessary (no action is required).

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

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/video/backlight/88pm860x_bl.c between commit e1c9ac420ef1
("Revert "backlight: fix memory leak on obscure error path"") from Linus'
tree and commit a6ccdcd98c39 ("mfd: 88pm860x: Use REG resource for
backlight") from the mfd tree.

I used the mfd tree version and can carry the fix as necessary (no action
is required).

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

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Dong Aisheng]

Hi Stephen,

On 18 September 2012 11:19, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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;
>   }

The fix looks ok to me.

Regards
Dong Aisheng

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
Documentation/devicetree/bindings/regulator/tps6586x.txt between commit
7f852e0584f6 ("regulator: tps6586x: correct vin pin for sm0/sm1/sm2")
from Linus' tree and commit 566a725dff0d ("mfd: dt: tps6586x: Add power
off control") from the mfd tree.

Just context changes.  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 Documentation/devicetree/bindings/regulator/tps6586x.txt
index da80c2a,03dfa4e..0000000
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -30,9 -34,11 +34,11 @@@ Example
  		#gpio-cells = <2>;
  		gpio-controller;
  
+ 		ti,system-power-controller;
+ 
 -		sm0-supply = <&some_reg>;
 -		sm1-supply = <&some_reg>;
 -		sm2-supply = <&some_reg>;
 +		vin-sm0-supply = <&some_reg>;
 +		vin-sm1-supply = <&some_reg>;
 +		vin-sm2-supply = <&some_reg>;
  		vinldo01-supply = <...>;
  		vinldo23-supply = <...>;
  		vinldo4-supply = <...>;

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM:
tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae5
("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/configs/tegra_defconfig
index 4be9c1e,7c0d115..0000000
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -105,7 -106,7 +105,8 @@@ CONFIG_I2C_MUX_PINCTRL=
  CONFIG_I2C_TEGRA=y
  CONFIG_SPI=y
  CONFIG_SPI_TEGRA=y
+ CONFIG_GPIO_TPS6586X=y
 +CONFIG_GPIO_TPS65910=y
  CONFIG_POWER_SUPPLY=y
  CONFIG_BATTERY_SBS=y
  CONFIG_SENSORS_LM90=y

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

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Laxman Dewangan]

On Wednesday 25 July 2012 06:48 AM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Samuel,
>
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM:
> tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae5
> ("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
Yes, this fix is proper.

Thanks,
Laxman

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu:
delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete
AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove
confusing ab8500-i2c file and merge into ab8500-core") from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mfd/Makefile
index 43672b8,afe96b2..0000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -87,12 -91,14 +91,11 @@@ obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633
  obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o
  obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o
  obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o
  obj-$(CONFIG_AB8500_DEBUG)	+= ab8500-debugfs.o
  obj-$(CONFIG_AB8500_GPADC)	+= ab8500-gpadc.o
  obj-$(CONFIG_MFD_DB8500_PRCMU)	+= db8500-prcmu.o
- # ab8500-i2c need to come after db8500-prcmu (which provides the channel)
- obj-$(CONFIG_AB8500_I2C_CORE)	+= ab8500-i2c.o
+ # ab8500-core need to come after db8500-prcmu (which provides the channel)
+ obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o
 -obj-$(CONFIG_MFD_DB5500_PRCMU)	+= db5500-prcmu.o
  obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o
  obj-$(CONFIG_PMIC_ADP5520)	+= adp5520.o
  obj-$(CONFIG_LPC_SCH)		+= lpc_sch.o

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/regulator/tps65910-regulator.c between commit a40a9c436b62
("regulator: tps65910: Use generic regmap enable/disable operations")
from Linus' tree and commit 3f7e82759c69 ("mfd: Commonize tps65910 regmap
access through header") from the mfd tree.

The former removes the routines that the latter updates, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/da9052-core.c between commit 8614419451d8 ("mfd: da9052: Fix
genirq abuse") from Linus' tree and commit 16e5e204c928 ("mfd: Add ADC
support to the DA9052/53 core") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mfd/da9052-core.c
index 7776aff,5036cf5..0000000
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@@ -663,8 -795,15 +795,14 @@@ int __devinit da9052_device_init(struc
  	if (ret < 0)
  		goto regmap_err;
  
 -	desc = irq_to_desc(da9052->chip_irq);
 -	da9052->irq_base = regmap_irq_chip_get_base(desc->action->dev_id);
 +	da9052->irq_base = regmap_irq_chip_get_base(da9052->irq_data);
  
+ 	ret = request_threaded_irq(DA9052_IRQ_ADC_EOM, NULL, da9052_auxadc_irq,
+ 				   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ 				   "adc irq", da9052);
+ 	if (ret != 0)
+ 		dev_err(da9052->dev, "DA9052 ADC IRQ failed ret=%d\n", ret);
+ 
  	ret = mfd_add_devices(da9052->dev, -1, da9052_subdev_info,
  			      ARRAY_SIZE(da9052_subdev_info), NULL, 0);
  	if (ret)
@@@ -680,7 -820,9 +819,8 @@@ regmap_err
  
  void da9052_device_exit(struct da9052 *da9052)
  {
+ 	free_irq(DA9052_IRQ_ADC_EOM, da9052);
 -	regmap_del_irq_chip(da9052->chip_irq,
 -			    irq_get_irq_data(da9052->irq_base)->chip_data);
 +	regmap_del_irq_chip(da9052->chip_irq, da9052->irq_data);
  	mfd_remove_devices(da9052->dev);
  }
  

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
Fix the number of interrupts managed by twl4030"), 75294957be1d
("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
964dba283439 ("devicetree: Add empty of_platform_populate() for !
CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
the mfd tree.

I *think* that the right thing to do is to use the version from the mfd
tree ...

I do wonder why I only got this now (in the merge window) ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

Hi Stephen,

On Fri, Mar 23, 2012 at 02:32:37PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
> Fix the number of interrupts managed by twl4030"), 75294957be1d
> ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
> 964dba283439 ("devicetree: Add empty of_platform_populate() for !
> CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
> ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
> ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
> the mfd tree.
> 
> I *think* that the right thing to do is to use the version from the mfd
> tree ...
That's correct.
I have a for-next-merge branch where I usually have the merge conflicts with
Linus tree fixed, in case you're interested.


> I do wonder why I only got this now (in the merge window) ...
I got a pull request from Benoit a couple days before the merge window opened.
Then I realized part of the pull request contained a merge of one of Grant's
branch. So I wanted to wait for Grant's code to get in before picking the mfd
work on top of it. I didn't want to send a pull request to Linus with a merge
point for something that would have been already merged. Maybe I was wrong,
you tell me.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Grant Likely]

On Fri, 23 Mar 2012 10:41:39 +0100, Samuel Ortiz <sameo@linux.intel.com> wrote:
> Hi Stephen,
> 
> On Fri, Mar 23, 2012 at 02:32:37PM +1100, Stephen Rothwell wrote:
> > Hi Samuel,
> > 
> > Today's linux-next merge of the mfd tree got a conflict in
> > drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
> > Fix the number of interrupts managed by twl4030"), 75294957be1d
> > ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
> > 964dba283439 ("devicetree: Add empty of_platform_populate() for !
> > CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
> > ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
> > ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
> > the mfd tree.
> > 
> > I *think* that the right thing to do is to use the version from the mfd
> > tree ...
> That's correct.
> I have a for-next-merge branch where I usually have the merge conflicts with
> Linus tree fixed, in case you're interested.
> 
> 
> > I do wonder why I only got this now (in the merge window) ...
> I got a pull request from Benoit a couple days before the merge window opened.
> Then I realized part of the pull request contained a merge of one of Grant's
> branch. So I wanted to wait for Grant's code to get in before picking the mfd
> work on top of it. I didn't want to send a pull request to Linus with a merge
> point for something that would have been already merged. Maybe I was wrong,
> you tell me.

It should have gone into linux-next before then.  Waiting for my tree
to hit linus' tree defeats the purpose of linux-next.  Now you're
branch hasn't had any testing and therefore is a risky merge.

If you've got a branch you intend to send to Linus, then it really
needs to be in linux-next.  If that branch depends on another branch,
that's fine; you can still hold off actually sending the pull req to
Linus until the dependency makes it in.  Better yet, *ask*.

g.

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

On Sat, Mar 24, 2012 at 05:31:52PM +0000, Grant Likely wrote:
> On Fri, 23 Mar 2012 10:41:39 +0100, Samuel Ortiz <sameo@linux.intel.com> wrote:
> > Hi Stephen,
> > 
> > On Fri, Mar 23, 2012 at 02:32:37PM +1100, Stephen Rothwell wrote:
> > > Hi Samuel,
> > > 
> > > Today's linux-next merge of the mfd tree got a conflict in
> > > drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
> > > Fix the number of interrupts managed by twl4030"), 75294957be1d
> > > ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
> > > 964dba283439 ("devicetree: Add empty of_platform_populate() for !
> > > CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
> > > ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
> > > ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
> > > the mfd tree.
> > > 
> > > I *think* that the right thing to do is to use the version from the mfd
> > > tree ...
> > That's correct.
> > I have a for-next-merge branch where I usually have the merge conflicts with
> > Linus tree fixed, in case you're interested.
> > 
> > 
> > > I do wonder why I only got this now (in the merge window) ...
> > I got a pull request from Benoit a couple days before the merge window opened.
> > Then I realized part of the pull request contained a merge of one of Grant's
> > branch. So I wanted to wait for Grant's code to get in before picking the mfd
> > work on top of it. I didn't want to send a pull request to Linus with a merge
> > point for something that would have been already merged. Maybe I was wrong,
> > you tell me.
> 
> It should have gone into linux-next before then.  Waiting for my tree
> to hit linus' tree defeats the purpose of linux-next.  Now you're
> branch hasn't had any testing and therefore is a risky merge.
The branch has been tested by TI folks, on 3 different TI platforms. And the
patches we're talking about are all TI's twl related ones.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Grant Likely]

On Mon, 26 Mar 2012 10:25:15 +0200, Samuel Ortiz <sameo@linux.intel.com> wrote:
> On Sat, Mar 24, 2012 at 05:31:52PM +0000, Grant Likely wrote:
> > On Fri, 23 Mar 2012 10:41:39 +0100, Samuel Ortiz <sameo@linux.intel.com> wrote:
> > > Hi Stephen,
> > > 
> > > On Fri, Mar 23, 2012 at 02:32:37PM +1100, Stephen Rothwell wrote:
> > > > Hi Samuel,
> > > > 
> > > > Today's linux-next merge of the mfd tree got a conflict in
> > > > drivers/mfd/twl-core.c between commits 5769089ac725 ("mfd: twl-core.c:
> > > > Fix the number of interrupts managed by twl4030"), 75294957be1d
> > > > ("irq_domain: Remove 'new' irq_domain in favour of the ppc one") and
> > > > 964dba283439 ("devicetree: Add empty of_platform_populate() for !
> > > > CONFIG_OF_ADDRESS (sparc)") from Linus' tree and commits 9e1786202704
> > > > ("mfd: Make twl-core not depend on pdata->irq_base/end") and 78518ffa08fc
> > > > ("mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files") from
> > > > the mfd tree.
> > > > 
> > > > I *think* that the right thing to do is to use the version from the mfd
> > > > tree ...
> > > That's correct.
> > > I have a for-next-merge branch where I usually have the merge conflicts with
> > > Linus tree fixed, in case you're interested.
> > > 
> > > 
> > > > I do wonder why I only got this now (in the merge window) ...
> > > I got a pull request from Benoit a couple days before the merge window opened.
> > > Then I realized part of the pull request contained a merge of one of Grant's
> > > branch. So I wanted to wait for Grant's code to get in before picking the mfd
> > > work on top of it. I didn't want to send a pull request to Linus with a merge
> > > point for something that would have been already merged. Maybe I was wrong,
> > > you tell me.
> > 
> > It should have gone into linux-next before then.  Waiting for my tree
> > to hit linus' tree defeats the purpose of linux-next.  Now you're
> > branch hasn't had any testing and therefore is a risky merge.
> The branch has been tested by TI folks, on 3 different TI platforms. And the
> patches we're talking about are all TI's twl related ones.

...hasn't had any integration testing.  It isn't the risk to your
platform that is the concern (indeed, I'd expect it to be tested on
the TI platforms).  It's the risk of breakage to other users that is
the issue.  That's why linux-next exists, to catch post-merge breakage
before the merge window opens, and that is why it is important to get
the branches in before the window opens.

In fact, this exact driver caused problems in linux-next before the
merge window opened that affected Randy Dunlap and Andrew Morton.
The irq_domain changes caused twl build failures on allmodconfig.  So,
even though it is "only" driver code being touched here, it still
affects the larger kernel community.

g.

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/leds/Kconfig between commit a6d511e51554 ("leds: add driver for
TCA6507 LED controller") from Linus' tree and commit 8584cb82f151 ("leds:
Add suuport for MAX8997-LED driver") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/leds/Kconfig
index 897a77d,c0e30e8..0000000
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -388,14 -387,13 +388,21 @@@ config LEDS_RENESAS_TP
  	  pin function. The latter to support brightness control.
  	  Brightness control is supported but hardware blinking is not.
  
 +config LEDS_TCA6507
 +	tristate "LED Support for TCA6507 I2C chip"
 +	depends on LEDS_CLASS && I2C
 +	help
 +	  This option enables support for LEDs connected to TC6507
 +	  LED driver chips accessed via the I2C bus.
 +	  Driver support brightness control and hardware-assisted blinking.
 +
+ config LEDS_MAX8997
+ 	tristate "LED support for MAX8997 PMIC"
+ 	depends on LEDS_CLASS && MFD_MAX8997
+ 	help
+ 	  This option enables support for on-chip LED drivers on
+ 	  MAXIM MAX8997 PMIC.
+ 
  config LEDS_TRIGGERS
  	bool "LED Trigger support"
  	depends on LEDS_CLASS

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/rtc/rtc-twl.c between commits dec35d19c4ec ("rtc: rtc-twl: Switch
to using threaded irq") and 34d623d11316 ("rtc: rtc-twl: Remove lockdep
related local_irq_enable()") from Linus' tree and commit 02e964b17e2f
("rtc: Move twl to threaded irq") from the mfd tree.

The 2 commits from Linus' tree do exactly what the single mfd tree commit
does.  I used the version from Linus' tree (which had further changes).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-ux500/board-mop500-regulators.c and
arch/arm/mach-ux500/board-mop500.c between commits d1de85a23144
("mach-ux500: add a few AB8500 regulator consumers v3") and a71b819b6edf
("mach-ux500: platform data for SFH7741 proximity sensor driver") from
Linus' tree and commit 00423735a08e ("mach-ux500: configure board for the
TPS61052 regulator v2") from the mfd tree.

I fixed them up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-ux500/board-mop500-regulators.c
index 875c91b,0825012..0000000
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@@ -13,55 -13,30 +13,79 @@@
  #include <linux/regulator/ab8500.h>
  #include "board-mop500-regulators.h"
  
+ /*
+  * TPS61052 regulator
+  */
+ static struct regulator_consumer_supply tps61052_vaudio_consumers[] = {
+ 	/*
+ 	 * Boost converter supply to raise voltage on audio speaker, this
+ 	 * is actually connected to three pins, VInVhfL (left amplifier)
+ 	 * VInVhfR (right amplifier) and VIntDClassInt - all three must
+ 	 * be connected to the same voltage.
+ 	 */
+ 	REGULATOR_SUPPLY("vintdclassint", "ab8500-codec.0"),
+ };
+ 
+ struct regulator_init_data tps61052_regulator = {
+ 	.constraints = {
+ 		.name = "vaudio-hf",
+ 		.min_uV = 4500000,
+ 		.max_uV = 4500000,
+ 		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ 	},
+ 	.num_consumer_supplies = ARRAY_SIZE(tps61052_vaudio_consumers),
+ 	.consumer_supplies = tps61052_vaudio_consumers,
+ };
+ 
 +static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
 +	/* External displays, connector on board 2v5 power supply */
 +	REGULATOR_SUPPLY("vaux12v5", "mcde.0"),
 +	/* SFH7741 proximity sensor */
 +	REGULATOR_SUPPLY("vcc", "gpio-keys.0"),
 +	/* BH1780GLS ambient light sensor */
 +	REGULATOR_SUPPLY("vcc", "2-0029"),
 +	/* lsm303dlh accelerometer */
 +	REGULATOR_SUPPLY("vdd", "3-0018"),
 +	/* lsm303dlh magnetometer */
 +	REGULATOR_SUPPLY("vdd", "3-001e"),
 +	/* Rohm BU21013 Touchscreen devices */
 +	REGULATOR_SUPPLY("avdd", "3-005c"),
 +	REGULATOR_SUPPLY("avdd", "3-005d"),
 +	/* Synaptics RMI4 Touchscreen device */
 +	REGULATOR_SUPPLY("vdd", "3-004b"),
 +};
 +
 +static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
 +	/* On-board eMMC power */
 +	REGULATOR_SUPPLY("vmmc", "sdi4"),
 +	/* AB8500 audio codec */
 +	REGULATOR_SUPPLY("vcc-N2158", "ab8500-codec.0"),
 +};
 +
 +static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
 +	/* External MMC slot power */
 +	REGULATOR_SUPPLY("vmmc", "sdi0"),
 +};
 +
 +static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {
 +	/* TV-out DENC supply */
 +	REGULATOR_SUPPLY("vtvout", "ab8500-denc.0"),
 +	/* Internal general-purpose ADC */
 +	REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"),
 +};
 +
 +static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {
 +	/* SoC core supply, no device */
 +	REGULATOR_SUPPLY("v-intcore", NULL),
 +	/* USB Transciever */
 +	REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"),
 +};
 +
 +static struct regulator_consumer_supply ab8500_vana_consumers[] = {
 +	/* External displays, connector on board, 1v8 power supply */
 +	REGULATOR_SUPPLY("vsmps2", "mcde.0"),
 +};
 +
  /* AB8500 regulators */
  struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
  	/* supplies to the display/camera */
diff --cc arch/arm/mach-ux500/board-mop500.c
index 8790d98,1e75d7e..0000000
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@ -21,9 -20,7 +21,10 @@@
  #include <linux/spi/spi.h>
  #include <linux/mfd/ab8500.h>
  #include <linux/mfd/tc3589x.h>
 +#include <linux/leds-lp5521.h>
 +#include <linux/input.h>
 +#include <linux/gpio_keys.h>
+ #include <linux/mfd/tps6105x.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -65,7 -104,26 +66,16 @@@ struct platform_device ab8500_device = 
  	.resource = ab8500_resources,
  };
  
 -static struct pl022_ssp_controller ssp0_platform_data = {
 -	.bus_id = 0,
 -	/* pl022 not yet supports dma */
 -	.enable_dma = 0,
 -	/* on this platform, gpio 31,142,144,214 &
 -	 * 224 are connected as chip selects
 -	 */
 -	.num_chipselect = 5,
 -};
 -
  /*
+  * TPS61052
+  */
+ 
+ static struct tps6105x_platform_data mop500_tps61052_data = {
+ 	.mode = TPS6105X_MODE_VOLTAGE,
+ 	.regulator_data = &tps61052_regulator,
+ };
+ 
+ /*
   * TC35892
   */
  
@@@ -85,60 -143,14 +95,64 @@@ static struct tc3589x_platform_data mop
  	.irq_base	= MOP500_EGPIO_IRQ_BASE,
  };
  
 +static struct lp5521_led_config lp5521_pri_led[] = {
 +       [0] = {
 +	       .chan_nr = 0,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +       [1] = {
 +	       .chan_nr = 1,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +       [2] = {
 +	       .chan_nr = 2,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +};
 +
 +static struct lp5521_platform_data __initdata lp5521_pri_data = {
 +       .label = "lp5521_pri",
 +       .led_config     = &lp5521_pri_led[0],
 +       .num_channels   = 3,
 +       .clock_mode     = LP5521_CLOCK_EXT,
 +};
 +
 +static struct lp5521_led_config lp5521_sec_led[] = {
 +       [0] = {
 +	       .chan_nr = 0,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +       [1] = {
 +	       .chan_nr = 1,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +       [2] = {
 +	       .chan_nr = 2,
 +	       .led_current = 0x2f,
 +	       .max_current = 0x5f,
 +       },
 +};
 +
 +static struct lp5521_platform_data __initdata lp5521_sec_data = {
 +       .label = "lp5521_sec",
 +       .led_config     = &lp5521_sec_led[0],
 +       .num_channels   = 3,
 +       .clock_mode     = LP5521_CLOCK_EXT,
 +};
 +
  static struct i2c_board_info mop500_i2c0_devices[] = {
  	{
+ 		I2C_BOARD_INFO("tps61052", 0x33),
+ 		.platform_data  = &mop500_tps61052_data,
+ 	},
+ 	{
  		I2C_BOARD_INFO("tc3589x", 0x42),
 -		.irq            = NOMADIK_GPIO_TO_IRQ(217),
 +		.irq		= NOMADIK_GPIO_TO_IRQ(217),
  		.platform_data  = &mop500_tc35892_data,
  	},
  };

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Linus Walleij]

2011/3/21 Stephen Rothwell <sfr@canb.auug.org.au>:

> I fixed them up (see below) and can carry the fix as necessary.

Fix looks correct, Sam if you push this to the MFD tree before
the pull request I'll be happy.

Yours,
Linus Walleij

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

Hi Linus,

On Mon, Mar 21, 2011 at 09:21:34AM +0100, Linus Walleij wrote:
> 2011/3/21 Stephen Rothwell <sfr@canb.auug.org.au>:
> 
> > I fixed them up (see below) and can carry the fix as necessary.
> 
> Fix looks correct, Sam if you push this to the MFD tree before
> the pull request I'll be happy.
I have just dropped 00423735a08e0d4030688496bca93f25c5e60111, since you were
willing to carry it out after the MFD tree merge. Is that still your plan ?

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Linus Walleij]

2011/3/22 Samuel Ortiz <sameo@linux.intel.com>:

>> Fix looks correct, Sam if you push this to the MFD tree before
>> the pull request I'll be happy.
> I have just dropped 00423735a08e0d4030688496bca93f25c5e60111, since you were
> willing to carry it out after the MFD tree merge. Is that still your plan ?

Yes if Torvalds accepts that and the merge window isn't already
closed by then, else it will go for 2.6.40, no big deal.

Yours,
Linus Walleij

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

Hi Stephen,

On Mon, Mar 21, 2011 at 12:26:15PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-ux500/board-mop500-regulators.c and
> arch/arm/mach-ux500/board-mop500.c between commits d1de85a23144
> ("mach-ux500: add a few AB8500 regulator consumers v3") and a71b819b6edf
> ("mach-ux500: platform data for SFH7741 proximity sensor driver") from
> Linus' tree and commit 00423735a08e ("mach-ux500: configure board for the
> TPS61052 regulator v2") from the mfd tree.
As per Linus Walleij request, I dropped commit 00423735a08e from my for-next
branch. So this should be fixed now.
Thanks again for the heads up.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-shmobile/board-ap4evb.c between commit
410d878bd05315a19894b8b4685107f2cd0712a5 ("ARM: mach-shmobile: ap4evb:
fix write protect for SDHI1") from Linus' tree and commit
c3cfb4003377a3397b27de0efe910c9abd838ac3 ("ARM: mach-shmobile: ap4evb:
Fix hotplug for SDHI1") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
index 95935c83,6c244a8..0000000
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -309,7 -320,8 +322,9 @@@ static struct sh_mobile_sdhi_info sdhi1
  	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,
  	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,
  	.tmio_ocr_mask	= MMC_VDD_165_195,
 +	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,
+ 	.tmio_caps	= MMC_CAP_NEEDS_POLL,
+ 	.get_cd		= slot_cn7_get_cd,
  };
  
  static struct resource sdhi1_resources[] = {

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

Hi Stephen,

On Mon, Sep 13, 2010 at 11:54:04AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit
> 410d878bd05315a19894b8b4685107f2cd0712a5 ("ARM: mach-shmobile: ap4evb:
> fix write protect for SDHI1") from Linus' tree and commit
> c3cfb4003377a3397b27de0efe910c9abd838ac3 ("ARM: mach-shmobile: ap4evb:
> Fix hotplug for SDHI1") from the mfd tree.
The conflict should be merged by now. Thanks for the warning.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/gpio/Kconfig between commit
c34f16b70a52e348a62944fe0d5c7c1eb9ad5b72 ("gpio: sx150x: add Semtech I2C
sx150x gpio expander driver") from Linus' tree and commit
59d11276842199a8ee525f1e88be7eafe8614e4c ("gpio: Add STMPE GPIO driver")
from the mfd tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpio/Kconfig
index f623953,38d6910..0000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -195,17 -195,13 +195,24 @@@ config GPIO_PCF857
  	  This driver provides an in-kernel interface to those GPIOs using
  	  platform-neutral GPIO calls.
  
 +config GPIO_SX150X
 +	bool "Semtech SX150x I2C GPIO expander"
 +	depends on I2C=y
 +	default n
 +	help
 +	  Say yes here to provide support for Semtech SX150-series I2C
 +	  GPIO expanders. Compatible models include:
 +
 +	  8 bits:  sx1508q
 +	  16 bits: sx1509q
 +
+ config GPIO_STMPE
+ 	bool "STMPE GPIOs"
+ 	depends on MFD_STMPE
+ 	help
+ 	  This enables support for the GPIOs found on the STMPE I/O
+ 	  Expanders.
+ 
  config GPIO_TC35892
  	bool "TC35892 GPIOs"
  	depends on MFD_TC35892

Re: linux-next: manual merge of the mfd tree with Linus' tree

[Samuel Ortiz]

Hi Stephen,

On Thu, Aug 12, 2010 at 02:41:35PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> drivers/gpio/Kconfig between commit
> c34f16b70a52e348a62944fe0d5c7c1eb9ad5b72 ("gpio: sx150x: add Semtech I2C
> sx150x gpio expander driver") from Linus' tree and commit
> 59d11276842199a8ee525f1e88be7eafe8614e4c ("gpio: Add STMPE GPIO driver")
> from the mfd tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.
That should be fixed now on my for-next branch.
Thanks a lot for the report.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/