* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 14:01 ` Alex Gershgorin
0 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 14:01 UTC (permalink / raw)
To: Mark Brown
Cc: sameo, linux-kernel, s.hauer, fabio.estevam, linux-arm-kernel,
Alex Gershgorin
This patch fixes the compilation errors after the patches
from series mc13xxx-add-I2C-support-V4 were applied.
Signed-off-by: Alex Gershgorin <alexg@meprolight.com>
---
drivers/mfd/Kconfig | 2 ++
drivers/mfd/mc13xxx-core.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
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,
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;
if (!np)
return -ENODEV;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 14:01 ` Alex Gershgorin
0 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 14:01 UTC (permalink / raw)
To: linux-arm-kernel
This patch fixes the compilation errors after the patches
from series mc13xxx-add-I2C-support-V4 were applied.
Signed-off-by: Alex Gershgorin <alexg@meprolight.com>
---
drivers/mfd/Kconfig | 2 ++
drivers/mfd/mc13xxx-core.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
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,
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;
if (!np)
return -ENODEV;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 14:01 ` Alex Gershgorin
@ 2012-03-28 14:40 ` Mark Brown
-1 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2012-03-28 14:40 UTC (permalink / raw)
To: Alex Gershgorin
Cc: sameo, linux-kernel, s.hauer, fabio.estevam, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 14:40 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2012-03-28 14:40 UTC (permalink / raw)
To: linux-arm-kernel
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>
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 14:40 ` Mark Brown
@ 2012-03-28 16:31 ` Alex Gershgorin
-1 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 16:31 UTC (permalink / raw)
To: Mark Brown; +Cc: sameo, linux-kernel, s.hauer, fabio.estevam, linux-arm-kernel
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?
You ask me about another solution?
> 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.
Ok
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 16:31 ` Alex Gershgorin
0 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 16:31 UTC (permalink / raw)
To: linux-arm-kernel
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?
You ask me about another solution?
> 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.
Ok
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 16:31 ` Alex Gershgorin
@ 2012-03-28 16:35 ` Mark Brown
-1 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2012-03-28 16:35 UTC (permalink / raw)
To: Alex Gershgorin
Cc: sameo, linux-kernel, s.hauer, fabio.estevam, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
On Wed, Mar 28, 2012 at 06:31:04PM +0200, Alex Gershgorin wrote:
> On Wed, Mar 28, 2012 at 04:01:13PM +0200, Alex Gershgorin wrote:
> > + select REGMAP_I2C if I2C
> > + select REGMAP_SPI if SPI_MASTER
> > > 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?
> You ask me about another solution?
I'm saying either I'm missing something or this needs to be fixed in the
patches that introduce the regmap usage.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 16:35 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2012-03-28 16:35 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 28, 2012 at 06:31:04PM +0200, Alex Gershgorin wrote:
> On Wed, Mar 28, 2012 at 04:01:13PM +0200, Alex Gershgorin wrote:
> > + select REGMAP_I2C if I2C
> > + select REGMAP_SPI if SPI_MASTER
> > > 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?
> You ask me about another solution?
I'm saying either I'm missing something or this needs to be fixed in the
patches that introduce the regmap usage.
-------------- 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/6b5ebf67/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 16:35 ` Mark Brown
@ 2012-03-28 17:38 ` Alex Gershgorin
-1 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 17:38 UTC (permalink / raw)
To: Mark Brown; +Cc: sameo, linux-kernel, s.hauer, fabio.estevam, linux-arm-kernel
> You ask me about another solution?
> > I'm saying either I'm missing something or this needs to be fixed in the
> > patches that introduce the regmap usage.
You understood correctly, it took me time to understand :-)
No problem I can split this patch:
> > + select REGMAP_I2C if I2C
> > + select REGMAP_SPI if SPI_MASTER
It will go to v4 mfd: mc13xxx-core: use regmap for register access,
Only the second part will be in this patch
- struct device_node *np = mc13xxx->dev.of_node;
+ struct device_node *np = mc13xxx->dev->of_node;
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 17:38 ` Alex Gershgorin
0 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-28 17:38 UTC (permalink / raw)
To: linux-arm-kernel
> You ask me about another solution?
> > I'm saying either I'm missing something or this needs to be fixed in the
> > patches that introduce the regmap usage.
You understood correctly, it took me time to understand :-)
No problem I can split this patch:
> > + select REGMAP_I2C if I2C
> > + select REGMAP_SPI if SPI_MASTER
It will go to v4 mfd: mc13xxx-core: use regmap for register access,
Only the second part will be in this patch
- struct device_node *np = mc13xxx->dev.of_node;
+ struct device_node *np = mc13xxx->dev->of_node;
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 14:01 ` Alex Gershgorin
@ 2012-03-28 20:47 ` Marc Reilly
-1 siblings, 0 replies; 14+ messages in thread
From: Marc Reilly @ 2012-03-28 20:47 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alex Gershgorin, Mark Brown, fabio.estevam, sameo, s.hauer, linux-kernel
Hi,
As Mark Brown already said, these changes should be squashed into a new
version of the patches.
On Thursday, March 29, 2012 01:01:13 AM Alex Gershgorin wrote:
> This patch fixes the compilation errors after the patches
> from series mc13xxx-add-I2C-support-V4 were applied.
>
> Signed-off-by: Alex Gershgorin <alexg@meprolight.com>
> ---
> drivers/mfd/Kconfig | 2 ++
> drivers/mfd/mc13xxx-core.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> 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
This can go under the "config MFD_MC13XXX_I2C" entry in patch 4/4 (the "if
I2C" won't be needed)
> + select REGMAP_SPI if SPI_MASTER
This can go under the "config MFD_MC13XXX_SPI" entry in patch 3/4
> help
> Enable support for the Freescale MC13783 and MC13892 PMICs.
> This driver provides common support for accessing the device,
> 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;
Good catch! This can be fixed up in 4/4
@Alex, you seen keen to do this, so I'll leave it to you :)
Otherwise, I'm happy to do it, just let me know.
Cheers,
Marc
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-28 20:47 ` Marc Reilly
0 siblings, 0 replies; 14+ messages in thread
From: Marc Reilly @ 2012-03-28 20:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
As Mark Brown already said, these changes should be squashed into a new
version of the patches.
On Thursday, March 29, 2012 01:01:13 AM Alex Gershgorin wrote:
> This patch fixes the compilation errors after the patches
> from series mc13xxx-add-I2C-support-V4 were applied.
>
> Signed-off-by: Alex Gershgorin <alexg@meprolight.com>
> ---
> drivers/mfd/Kconfig | 2 ++
> drivers/mfd/mc13xxx-core.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> 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
This can go under the "config MFD_MC13XXX_I2C" entry in patch 4/4 (the "if
I2C" won't be needed)
> + select REGMAP_SPI if SPI_MASTER
This can go under the "config MFD_MC13XXX_SPI" entry in patch 3/4
> help
> Enable support for the Freescale MC13783 and MC13892 PMICs.
> This driver provides common support for accessing the device,
> 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;
Good catch! This can be fixed up in 4/4
@Alex, you seen keen to do this, so I'll leave it to you :)
Otherwise, I'm happy to do it, just let me know.
Cheers,
Marc
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
2012-03-28 20:47 ` Marc Reilly
@ 2012-03-29 7:51 ` Alex Gershgorin
-1 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-29 7:51 UTC (permalink / raw)
To: marc
Cc: Mark Brown, fabio.estevam, sameo, s.hauer, linux-kernel,
linux-arm-kernel
Hi Marc,
> @Alex, you seen keen to do this, so I'll leave it to you :)
> Otherwise, I'm happy to do it, just let me know.
No problem, I would gladly give it to you :-)
Regards,
Alex Gershgorin
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
@ 2012-03-29 7:51 ` Alex Gershgorin
0 siblings, 0 replies; 14+ messages in thread
From: Alex Gershgorin @ 2012-03-29 7:51 UTC (permalink / raw)
To: linux-arm-kernel
Hi Marc,
> @Alex, you seen keen to do this, so I'll leave it to you :)
> Otherwise, I'm happy to do it, just let me know.
No problem, I would gladly give it to you :-)
Regards,
Alex Gershgorin
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-03-29 7:52 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-28 14:01 [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4 Alex Gershgorin
2012-03-28 14:01 ` Alex Gershgorin
2012-03-28 14:40 ` Mark Brown
2012-03-28 14:40 ` Mark Brown
2012-03-28 16:31 ` Alex Gershgorin
2012-03-28 16:31 ` Alex Gershgorin
2012-03-28 16:35 ` Mark Brown
2012-03-28 16:35 ` Mark Brown
2012-03-28 17:38 ` Alex Gershgorin
2012-03-28 17:38 ` Alex Gershgorin
2012-03-28 20:47 ` Marc Reilly
2012-03-28 20:47 ` Marc Reilly
2012-03-29 7:51 ` Alex Gershgorin
2012-03-29 7:51 ` Alex Gershgorin
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.