[PATCH] mfd: mc13xxx: add I2C support fix building for v3.4

[broonie@opensource.wolfsonmicro.com (Mark Brown)]

On Wed, Mar 28, 2012 at 04:01:13PM +0200, Alex Gershgorin wrote:

> index c3fbc5e..2119732 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -577,6 +577,8 @@ config MFD_MC13XXX
>  	depends on SPI_MASTER || I2C
>  	select MFD_CORE
>  	select MFD_MC13783
> +	select REGMAP_I2C if I2C
> +	select REGMAP_SPI if SPI_MASTER
>  	help
>  	  Enable support for the Freescale MC13783 and MC13892 PMICs.
>  	  This driver provides common support for accessing the device,

I'd really expect this to be squashed into the patches adding the regmap
usage for I2C and SPI, how can those patches work without this?

> diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
> index 31dbf91..5a60273 100644
> --- a/drivers/mfd/mc13xxx-core.c
> +++ b/drivers/mfd/mc13xxx-core.c
> @@ -616,7 +616,7 @@ static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)
>  #ifdef CONFIG_OF
>  static int mc13xxx_probe_flags_dt(struct mc13xxx *mc13xxx)
>  {
> -	struct device_node *np = mc13xxx->dev.of_node;
> +	struct device_node *np = mc13xxx->dev->of_node;

This looks like it should be submitted properly as a bug fix for
inclusion on 3.4 or squashed into whatever change introduces the issue
if it's not present in 3.4.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120328/161ab84e/attachment.sig>