linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the mfd tree
@ 2017-04-04  6:44 Stephen Rothwell
  2017-04-04  8:19 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2017-04-04  6:44 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andy Shevchenko

Hi Lee,

After merging the mfd tree, today's linux-next build (powerpc
allyesconfig) failed like this:

/home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory

Caused by commit

  eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-04  6:44 linux-next: build failure after merge of the mfd tree Stephen Rothwell
@ 2017-04-04  8:19 ` Lee Jones
  2017-04-04  8:21   ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-04-04  8:19 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andy Shevchenko

On Tue, 04 Apr 2017, Stephen Rothwell wrote:

> Hi Lee,
> 
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory
> 
> Caused by commit
> 
>   eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units")
> 
> I have reverted that commit for today.

Andy,

I'm pulling this commit.  Despite you thinking the error is unrelated
to your patch, something is clearly wrong and I don't have time to
investigate.

Ball is in your court.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-04  8:19 ` Lee Jones
@ 2017-04-04  8:21   ` Lee Jones
  2017-04-04 12:31     ` Andy Shevchenko
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-04-04  8:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andy Shevchenko

On Tue, 04 Apr 2017, Lee Jones wrote:

> On Tue, 04 Apr 2017, Stephen Rothwell wrote:
> 
> > Hi Lee,
> > 
> > After merging the mfd tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory
> > 
> > Caused by commit
> > 
> >   eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units")
> > 
> > I have reverted that commit for today.
> 
> Andy,
> 
> I'm pulling this commit.  Despite you thinking the error is unrelated
> to your patch, something is clearly wrong and I don't have time to
> investigate.
> 
> Ball is in your court.

Okay, I've had a *very* quick looks.

Seems as if you should be depending on INTEL_PMC_IPC.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-04  8:21   ` Lee Jones
@ 2017-04-04 12:31     ` Andy Shevchenko
  2017-04-10  2:11       ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Andy Shevchenko @ 2017-04-04 12:31 UTC (permalink / raw)
  To: Lee Jones, Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote:
> On Tue, 04 Apr 2017, Lee Jones wrote:
> 
> > On Tue, 04 Apr 2017, Stephen Rothwell wrote:
> > 
> > > Hi Lee,
> > > 
> > > After merging the mfd tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > > 
> > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31:
> > > fatal error: asm/intel_pmc_ipc.h: No such file or directory
> > > 
> > > Caused by commit
> > > 
> > >   eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation
> > > units")
> > > 
> > > I have reverted that commit for today.
> > 
> > Andy,
> > 
> > I'm pulling this commit.  Despite you thinking the error is
> > unrelated
> > to your patch, something is clearly wrong and I don't have time to
> > investigate.
> > 
> > Ball is in your court.
> 
> Okay, I've had a *very* quick looks.

> Seems as if you should be depending on INTEL_PMC_IPC.

As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in
a way to provide a header in include/platform_data/x86.

I will prepare v4.
Thanks.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-04 12:31     ` Andy Shevchenko
@ 2017-04-10  2:11       ` Stephen Rothwell
  2017-04-10  6:55         ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2017-04-10  2:11 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Lee Jones, Linux-Next Mailing List, Linux Kernel Mailing List

Hi all,

On Tue, 04 Apr 2017 15:31:15 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
> On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote:
> > On Tue, 04 Apr 2017, Lee Jones wrote:
> >   
> > > On Tue, 04 Apr 2017, Stephen Rothwell wrote:
> > >   
> > > > After merging the mfd tree, today's linux-next build (powerpc
> > > > allyesconfig) failed like this:
> > > > 
> > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31:
> > > > fatal error: asm/intel_pmc_ipc.h: No such file or directory
> > > > 
> > > > Caused by commit
> > > > 
> > > >   eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation
> > > > units")
> > > > 
> > > > I have reverted that commit for today.  
> > > 
> > > Andy,
> > > 
> > > I'm pulling this commit.  Despite you thinking the error is unrelated
> > > to your patch, something is clearly wrong and I don't have time to
> > > investigate.
> > > 
> > > Ball is in your court.  
> > 
> > Okay, I've had a *very* quick looks.  
> 
> > Seems as if you should be depending on INTEL_PMC_IPC.  
> 
> As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in
> a way to provide a header in include/platform_data/x86.
> 
> I will prepare v4.
> Thanks.

Ping?

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-10  2:11       ` Stephen Rothwell
@ 2017-04-10  6:55         ` Lee Jones
  2017-04-10  7:53           ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-04-10  6:55 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andy Shevchenko, Linux-Next Mailing List, Linux Kernel Mailing List

On Mon, 10 Apr 2017, Stephen Rothwell wrote:

> Hi all,
> 
> On Tue, 04 Apr 2017 15:31:15 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> >
> > On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote:
> > > On Tue, 04 Apr 2017, Lee Jones wrote:
> > >   
> > > > On Tue, 04 Apr 2017, Stephen Rothwell wrote:
> > > >   
> > > > > After merging the mfd tree, today's linux-next build (powerpc
> > > > > allyesconfig) failed like this:
> > > > > 
> > > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31:
> > > > > fatal error: asm/intel_pmc_ipc.h: No such file or directory
> > > > > 
> > > > > Caused by commit
> > > > > 
> > > > >   eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation
> > > > > units")
> > > > > 
> > > > > I have reverted that commit for today.  
> > > > 
> > > > Andy,
> > > > 
> > > > I'm pulling this commit.  Despite you thinking the error is unrelated
> > > > to your patch, something is clearly wrong and I don't have time to
> > > > investigate.
> > > > 
> > > > Ball is in your court.  
> > > 
> > > Okay, I've had a *very* quick looks.  
> > 
> > > Seems as if you should be depending on INTEL_PMC_IPC.  
> > 
> > As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in
> > a way to provide a header in include/platform_data/x86.
> > 
> > I will prepare v4.
> > Thanks.
> 
> Ping?

I guess this is still causing an issue in -next?

The patch has now been removed from mfd-next and the result pushed.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-04-10  6:55         ` Lee Jones
@ 2017-04-10  7:53           ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-04-10  7:53 UTC (permalink / raw)
  To: Lee Jones
  Cc: Andy Shevchenko, Linux-Next Mailing List, Linux Kernel Mailing List

Hi Lee,

On Mon, 10 Apr 2017 07:55:52 +0100 Lee Jones <lee.jones@linaro.org> wrote:
>
> I guess this is still causing an issue in -next?

Yeah.

> The patch has now been removed from mfd-next and the result pushed.

Thanks.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2023-04-06  7:36 ` Lee Jones
@ 2023-04-06 17:22   ` Mark Brown
  0 siblings, 0 replies; 127+ messages in thread
From: Mark Brown @ 2023-04-06 17:22 UTC (permalink / raw)
  To: Lee Jones
  Cc: Stephen Rothwell, William Breathitt Gray, Aidan MacDonald,
	Linux Kernel Mailing List, Linux Next Mailing List

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

On Thu, Apr 06, 2023 at 08:36:46AM +0100, Lee Jones wrote:

> Applied, squashed and credit given, thanks:

> Author: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
> Date:   Thu Feb 16 22:22:12 2023 +0000
> 
>     mfd: qcom-pm8008: Convert irq chip to config regs
> 
>     Replace type and virtual registers, which are both deprecated,
>     with config registers. This also simplifies the driver because
>     IRQ types are set in one place, the set_type_config() callback.

You should need this I think:

The following changes since commit e8d018dd0257f744ca50a729e3d042cf2ec9da65:

  Linux 6.3-rc3 (2023-03-19 13:27:55 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git tags/regmap-set-type-irq-drv-data

for you to fetch changes up to 7697c64b9e4908196f0ae68aa6d423dd40607973:

  regmap: Pass irq_drv_data as a parameter for set_type_config() (2023-04-05 17:19:24 +0100)

----------------------------------------------------------------
regmap: Pass irq_drv_data as a parameter for set_type_config()

Allow callbacks to access irq_drv_data.

----------------------------------------------------------------
William Breathitt Gray (1):
      regmap: Pass irq_drv_data as a parameter for set_type_config()

 drivers/base/regmap/regmap-irq.c | 8 +++++---
 include/linux/regmap.h           | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2023-04-06  2:00 Stephen Rothwell
@ 2023-04-06  7:36 ` Lee Jones
  2023-04-06 17:22   ` Mark Brown
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2023-04-06  7:36 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mark Brown, William Breathitt Gray, Aidan MacDonald,
	Linux Kernel Mailing List, Linux Next Mailing List

On Thu, 06 Apr 2023, Stephen Rothwell wrote:

> Hi all,
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mfd/qcom-pm8008.c:135:35: error: initialization of 'int (*)(unsigned int **, unsigned int,  const struct regmap_irq *, int,  void *)' from incompatible pointer type 'int (*)(unsigned int **, unsigned int,  const struct regmap_irq *, int)' [-Werror=incompatible-pointer-types]
>   135 |         .set_type_config        = pm8008_set_type_config,
>       |                                   ^~~~~~~~~~~~~~~~~~~~~~
> drivers/mfd/qcom-pm8008.c:135:35: note: (near initialization for 'pm8008_irq_chip.set_type_config')
>
> Caused by commit
>
>   72a8a08b0c62 ("mfd: qcom-pm8008: Convert irq chip to config regs")
>
> interacting with commit
>
>   7697c64b9e49 ("regmap: Pass irq_drv_data as a parameter for set_type_config()")
>
> from the regmap tree.
>
> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 6 Apr 2023 11:37:44 +1000
> Subject: [PATCH] fixup for "mfd: qcom-pm8008: Convert irq chip to config regs"
>
> interacting with "regmap: Pass irq_drv_data as a parameter for set_type_config()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/mfd/qcom-pm8008.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
> index a33fbc42ac8e..e60c838a78c1 100644
> --- a/drivers/mfd/qcom-pm8008.c
> +++ b/drivers/mfd/qcom-pm8008.c
> @@ -85,7 +85,8 @@ static unsigned int pm8008_get_irq_reg(struct regmap_irq_chip_data *data,
>  }
>
>  static int pm8008_set_type_config(unsigned int **buf, unsigned int type,
> -				  const struct regmap_irq *irq_data, int idx)
> +				  const struct regmap_irq *irq_data, int idx,
> +				  void *irq_drv_data)
>  {
>  	switch (type) {
>  	case IRQ_TYPE_EDGE_FALLING:

Applied, squashed and credit given, thanks:

Author: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Date:   Thu Feb 16 22:22:12 2023 +0000

    mfd: qcom-pm8008: Convert irq chip to config regs

    Replace type and virtual registers, which are both deprecated,
    with config registers. This also simplifies the driver because
    IRQ types are set in one place, the set_type_config() callback.

    Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
    [Lee: Squashed in fix-up patch from Stephen Rothwell adapting to new .set_type_config() API]
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Lee Jones <lee@kernel.org>
    Link: https://lore.kernel.org/r/20230216222214.138671-3-aidanmacdonald.0x0@gmail.com
---
 drivers/mfd/qcom-pm8008.c | 51 ++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 39fd2a792e736..d502ecf055903 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -66,15 +66,16 @@ static struct regmap_irq_sub_irq_map pm8008_sub_reg_offsets[] = {
 	REGMAP_IRQ_MAIN_REG_OFFSET(p3_offs),
 };

-static unsigned int pm8008_virt_regs[] = {
-	PM8008_POLARITY_HI_BASE,
-	PM8008_POLARITY_LO_BASE,
-};
-
 enum {
+	SET_TYPE_INDEX,
 	POLARITY_HI_INDEX,
 	POLARITY_LO_INDEX,
-	PM8008_NUM_VIRT_REGS,
+};
+
+static unsigned int pm8008_config_regs[] = {
+	PM8008_TYPE_BASE,
+	PM8008_POLARITY_HI_BASE,
+	PM8008_POLARITY_LO_BASE,
 };

 static struct regmap_irq pm8008_irqs[] = {
@@ -88,32 +89,37 @@ static struct regmap_irq pm8008_irqs[] = {
 	REGMAP_IRQ_REG(PM8008_IRQ_GPIO2,	PM8008_GPIO2,	BIT(0)),
 };

-static int pm8008_set_type_virt(unsigned int **virt_buf,
-				     unsigned int type, unsigned long hwirq,
-				     int reg)
+static int pm8008_set_type_config(unsigned int **buf, unsigned int type,
+				 const struct regmap_irq *irq_data, int idx,
+				 void *irq_drv_data)
 {
 	switch (type) {
 	case IRQ_TYPE_EDGE_FALLING:
 	case IRQ_TYPE_LEVEL_LOW:
-		virt_buf[POLARITY_HI_INDEX][reg] &= ~pm8008_irqs[hwirq].mask;
-		virt_buf[POLARITY_LO_INDEX][reg] |= pm8008_irqs[hwirq].mask;
+		buf[POLARITY_HI_INDEX][idx] &= ~irq_data->mask;
+		buf[POLARITY_LO_INDEX][idx] |= irq_data->mask;
 		break;

 	case IRQ_TYPE_EDGE_RISING:
 	case IRQ_TYPE_LEVEL_HIGH:
-		virt_buf[POLARITY_HI_INDEX][reg] |= pm8008_irqs[hwirq].mask;
-		virt_buf[POLARITY_LO_INDEX][reg] &= ~pm8008_irqs[hwirq].mask;
+		buf[POLARITY_HI_INDEX][idx] |= irq_data->mask;
+		buf[POLARITY_LO_INDEX][idx] &= ~irq_data->mask;
 		break;

 	case IRQ_TYPE_EDGE_BOTH:
-		virt_buf[POLARITY_HI_INDEX][reg] |= pm8008_irqs[hwirq].mask;
-		virt_buf[POLARITY_LO_INDEX][reg] |= pm8008_irqs[hwirq].mask;
+		buf[POLARITY_HI_INDEX][idx] |= irq_data->mask;
+		buf[POLARITY_LO_INDEX][idx] |= irq_data->mask;
 		break;

 	default:
 		return -EINVAL;
 	}

+	if (type & IRQ_TYPE_EDGE_BOTH)
+		buf[SET_TYPE_INDEX][idx] |= irq_data->mask;
+	else
+		buf[SET_TYPE_INDEX][idx] &= ~irq_data->mask;
+
 	return 0;
 }

@@ -121,21 +127,20 @@ static struct regmap_irq_chip pm8008_irq_chip = {
 	.name			= "pm8008_irq",
 	.main_status		= I2C_INTR_STATUS_BASE,
 	.num_main_regs		= 1,
-	.num_virt_regs		= PM8008_NUM_VIRT_REGS,
 	.irqs			= pm8008_irqs,
 	.num_irqs		= ARRAY_SIZE(pm8008_irqs),
 	.num_regs		= PM8008_NUM_PERIPHS,
 	.not_fixed_stride	= true,
 	.sub_reg_offsets	= pm8008_sub_reg_offsets,
-	.set_type_virt		= pm8008_set_type_virt,
 	.status_base		= PM8008_STATUS_BASE,
 	.mask_base		= PM8008_MASK_BASE,
 	.unmask_base		= PM8008_UNMASK_BASE,
 	.mask_unmask_non_inverted = true,
-	.type_base		= PM8008_TYPE_BASE,
 	.ack_base		= PM8008_ACK_BASE,
-	.virt_reg_base		= pm8008_virt_regs,
-	.num_type_reg		= PM8008_NUM_PERIPHS,
+	.config_base		= pm8008_config_regs,
+	.num_config_bases	= ARRAY_SIZE(pm8008_config_regs),
+	.num_config_regs	= PM8008_NUM_PERIPHS,
+	.set_type_config	= pm8008_set_type_config,
 };

 static struct regmap_config qcom_mfd_regmap_cfg = {
@@ -185,11 +190,7 @@ static int pm8008_probe_irq_peripherals(struct device *dev,
 	for (i = 0; i < ARRAY_SIZE(pm8008_irqs); i++) {
 		type = &pm8008_irqs[i].type;

-		type->type_reg_offset	 = pm8008_irqs[i].reg_offset;
-		type->type_rising_val	 = pm8008_irqs[i].mask;
-		type->type_falling_val	 = pm8008_irqs[i].mask;
-		type->type_level_high_val = 0;
-		type->type_level_low_val  = 0;
+		type->type_reg_offset = pm8008_irqs[i].reg_offset;

 		if (type->type_reg_offset == PM8008_MISC)
 			type->types_supported = IRQ_TYPE_EDGE_RISING;

--
Lee Jones [李琼斯]

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2023-04-06  2:00 Stephen Rothwell
  2023-04-06  7:36 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2023-04-06  2:00 UTC (permalink / raw)
  To: Lee Jones, Mark Brown
  Cc: William Breathitt Gray, Aidan MacDonald,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/qcom-pm8008.c:135:35: error: initialization of 'int (*)(unsigned int **, unsigned int,  const struct regmap_irq *, int,  void *)' from incompatible pointer type 'int (*)(unsigned int **, unsigned int,  const struct regmap_irq *, int)' [-Werror=incompatible-pointer-types]
  135 |         .set_type_config        = pm8008_set_type_config,
      |                                   ^~~~~~~~~~~~~~~~~~~~~~
drivers/mfd/qcom-pm8008.c:135:35: note: (near initialization for 'pm8008_irq_chip.set_type_config')

Caused by commit

  72a8a08b0c62 ("mfd: qcom-pm8008: Convert irq chip to config regs")

interacting with commit

  7697c64b9e49 ("regmap: Pass irq_drv_data as a parameter for set_type_config()")

from the regmap tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Apr 2023 11:37:44 +1000
Subject: [PATCH] fixup for "mfd: qcom-pm8008: Convert irq chip to config regs"

interacting with "regmap: Pass irq_drv_data as a parameter for set_type_config()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mfd/qcom-pm8008.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index a33fbc42ac8e..e60c838a78c1 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -85,7 +85,8 @@ static unsigned int pm8008_get_irq_reg(struct regmap_irq_chip_data *data,
 }
 
 static int pm8008_set_type_config(unsigned int **buf, unsigned int type,
-				  const struct regmap_irq *irq_data, int idx)
+				  const struct regmap_irq *irq_data, int idx,
+				  void *irq_drv_data)
 {
 	switch (type) {
 	case IRQ_TYPE_EDGE_FALLING:
-- 
2.39.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2023-03-31  1:15 Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2023-03-31  1:15 UTC (permalink / raw)
  To: Lee Jones
  Cc: Uwe Kleine-König, Wolfram Sang, Min Li,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/rsmu_i2c.c:282:18: error: initialization of 'int (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *, const struct i2c_device_id *)' [-Werror=incompatible-pointer-types]
  282 |         .probe = rsmu_i2c_probe,
      |                  ^~~~~~~~~~~~~~
drivers/mfd/rsmu_i2c.c:282:18: note: (near initialization for 'rsmu_i2c_driver.<anonymous>.probe')

Caused by commit

  1b3b1d6c27cc ("mfd: rsmu: Support 32-bit address space")

interacting with commit

  03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")

from Linus' tree (v6.3-rc2).

I applied the following merge fix patch (which may not be right :-():

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 31 Mar 2023 12:05:44 +1100
Subject: [PATCH] fixup for "mfd: rsmu: Support 32-bit address space"

interacting with "i2c: Switch .probe() to not take an id parameter"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mfd/rsmu_i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
index 221023faaadf..26972a5aff45 100644
--- a/drivers/mfd/rsmu_i2c.c
+++ b/drivers/mfd/rsmu_i2c.c
@@ -201,9 +201,9 @@ static const struct regmap_config rsmu_sl_regmap_config = {
 	.can_multi_write = true,
 };
 
-static int rsmu_i2c_probe(struct i2c_client *client,
-			  const struct i2c_device_id *id)
+static int rsmu_i2c_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	const struct regmap_config *cfg;
 	struct rsmu_ddata *rsmu;
 	int ret;
-- 
2.39.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2022-07-05 12:32 ` Lee Jones
@ 2022-07-05 14:26   ` Aidan MacDonald
  0 siblings, 0 replies; 127+ messages in thread
From: Aidan MacDonald @ 2022-07-05 14:26 UTC (permalink / raw)
  To: Lee Jones
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List


Lee Jones <lee.jones@linaro.org> writes:

> On Tue, 05 Jul 2022, Stephen Rothwell wrote:
>
>> Hi all,
>> 
>> After merging the mfd tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>> 
>> drivers/mfd/axp20x.c:634:35: error: initialization of 'unsigned int (*)(struct regmap_irq_chip_data *, unsigned int,  int)' from incompatible pointer type 'int (*)(unsigned int,  int)' [-Werror=incompatible-pointer-types]
>>   634 |         .get_irq_reg            = axp192_get_irq_reg,
>>       |                                   ^~~~~~~~~~~~~~~~~~
>> drivers/mfd/axp20x.c:634:35: note: (near initialization for 'axp192_regmap_irq_chip.get_irq_reg')
>> 
>> Caused by commit
>> 
>>   8c7d8aa029a3 ("mfd: axp20x: Add support for AXP192")
>> 
>> I have used the mfd tree from next-20220704 for today.
>
> Aidan, what are your plans?

This is missing the prerequisite regmap-irq patches, sorry if it wasn't
clear from the cover letter.

Link: https://lore.kernel.org/lkml/20220623211420.918875-1-aidanmacdonald.0x0@gmail.com/

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2022-07-05  1:54 Stephen Rothwell
@ 2022-07-05 12:32 ` Lee Jones
  2022-07-05 14:26   ` Aidan MacDonald
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2022-07-05 12:32 UTC (permalink / raw)
  To: Stephen Rothwell, Aidan MacDonald
  Cc: Aidan MacDonald, Linux Kernel Mailing List, Linux Next Mailing List

On Tue, 05 Jul 2022, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the mfd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/mfd/axp20x.c:634:35: error: initialization of 'unsigned int (*)(struct regmap_irq_chip_data *, unsigned int,  int)' from incompatible pointer type 'int (*)(unsigned int,  int)' [-Werror=incompatible-pointer-types]
>   634 |         .get_irq_reg            = axp192_get_irq_reg,
>       |                                   ^~~~~~~~~~~~~~~~~~
> drivers/mfd/axp20x.c:634:35: note: (near initialization for 'axp192_regmap_irq_chip.get_irq_reg')
> 
> Caused by commit
> 
>   8c7d8aa029a3 ("mfd: axp20x: Add support for AXP192")
> 
> I have used the mfd tree from next-20220704 for today.

Aidan, what are your plans?

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2022-07-05  1:54 Stephen Rothwell
  2022-07-05 12:32 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2022-07-05  1:54 UTC (permalink / raw)
  To: Lee Jones
  Cc: Aidan MacDonald, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the mfd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/mfd/axp20x.c:634:35: error: initialization of 'unsigned int (*)(struct regmap_irq_chip_data *, unsigned int,  int)' from incompatible pointer type 'int (*)(unsigned int,  int)' [-Werror=incompatible-pointer-types]
  634 |         .get_irq_reg            = axp192_get_irq_reg,
      |                                   ^~~~~~~~~~~~~~~~~~
drivers/mfd/axp20x.c:634:35: note: (near initialization for 'axp192_regmap_irq_chip.get_irq_reg')

Caused by commit

  8c7d8aa029a3 ("mfd: axp20x: Add support for AXP192")

I have used the mfd tree from next-20220704 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2022-02-28  6:08   ` Stephen Rothwell
@ 2022-02-28  8:17     ` Lee Jones
  0 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2022-02-28  8:17 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: broonie, Linux Kernel Mailing List, Linux Next Mailing List

On Mon, 28 Feb 2022, Stephen Rothwell wrote:

> Hi Lee,
> 
> On Wed, 23 Feb 2022 17:03:43 +0000 Lee Jones <lee.jones@linaro.org> wrote:
> >
> > On Wed, 23 Feb 2022, broonie@kernel.org wrote:
> > 
> > > After merging the mfd tree, today's linux-next build (KCONFIG_NAME)
> > > failed like this:
> > > 
> > > /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:255:35: error: redefinition of 'sprd_pmic_spi_ids'
> > >   255 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
> > >       |                                   ^~~~~~~~~~~~~~~~~
> > > /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:242:35: note: previous definition of 'sprd_pmic_spi_ids' was here
> > >   242 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
> > >       |                                   ^~~~~~~~~~~~~~~~~
> > > 
> > > Caused by commit
> > > 
> > >   6fc90b92e9c7ef348 ("mfd: sprd: Add SPI device ID table")
> > > 
> > > I used the MFD tree from yesterday instead.  
> > 
> > Thanks.
> > 
> > Will fix for tomorrow.
> 
> I am still getting this build failure.  It is an x86_64 allmodconfig
> build.

The good news is, this is fixed locally.

The bad news is, I didn't push it to the public repo. :)

Should be fixed for tomorrow instead.

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2022-02-23 17:03 ` Lee Jones
@ 2022-02-28  6:08   ` Stephen Rothwell
  2022-02-28  8:17     ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2022-02-28  6:08 UTC (permalink / raw)
  To: Lee Jones; +Cc: broonie, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi Lee,

On Wed, 23 Feb 2022 17:03:43 +0000 Lee Jones <lee.jones@linaro.org> wrote:
>
> On Wed, 23 Feb 2022, broonie@kernel.org wrote:
> 
> > After merging the mfd tree, today's linux-next build (KCONFIG_NAME)
> > failed like this:
> > 
> > /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:255:35: error: redefinition of 'sprd_pmic_spi_ids'
> >   255 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
> >       |                                   ^~~~~~~~~~~~~~~~~
> > /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:242:35: note: previous definition of 'sprd_pmic_spi_ids' was here
> >   242 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
> >       |                                   ^~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   6fc90b92e9c7ef348 ("mfd: sprd: Add SPI device ID table")
> > 
> > I used the MFD tree from yesterday instead.  
> 
> Thanks.
> 
> Will fix for tomorrow.

I am still getting this build failure.  It is an x86_64 allmodconfig
build.
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2022-02-23 16:54 broonie
@ 2022-02-23 17:03 ` Lee Jones
  2022-02-28  6:08   ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2022-02-23 17:03 UTC (permalink / raw)
  To: broonie; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

On Wed, 23 Feb 2022, broonie@kernel.org wrote:

> Hi all,
> 
> After merging the mfd tree, today's linux-next build (KCONFIG_NAME)
> failed like this:
> 
> /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:255:35: error: redefinition of 'sprd_pmic_spi_ids'
>   255 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
>       |                                   ^~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:242:35: note: previous definition of 'sprd_pmic_spi_ids' was here
>   242 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
>       |                                   ^~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   6fc90b92e9c7ef348 ("mfd: sprd: Add SPI device ID table")
> 
> I used the MFD tree from yesterday instead.

Thanks.

Will fix for tomorrow.

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2022-02-23 16:54 broonie
  2022-02-23 17:03 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: broonie @ 2022-02-23 16:54 UTC (permalink / raw)
  To: Lee Jones; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

Hi all,

After merging the mfd tree, today's linux-next build (KCONFIG_NAME)
failed like this:

/tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:255:35: error: redefinition of 'sprd_pmic_spi_ids'
  255 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
      |                                   ^~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:242:35: note: previous definition of 'sprd_pmic_spi_ids' was here
  242 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
      |                                   ^~~~~~~~~~~~~~~~~

Caused by commit

  6fc90b92e9c7ef348 ("mfd: sprd: Add SPI device ID table")

I used the MFD tree from yesterday instead.

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-11-05  1:57   ` Michał Mirosław
@ 2020-11-05  9:09     ` Lee Jones
  0 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2020-11-05  9:09 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Stephen Rothwell, Linus Walleij, Linux Kernel Mailing List,
	Linux Next Mailing List

On Thu, 05 Nov 2020, Michał Mirosław wrote:

> On Thu, Nov 05, 2020 at 12:50:27PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the mfd tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get':
> > drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function 'tps65910_reg_read' [-Werror=implicit-function-declaration]
> >    31 |  tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val);
> >       |  ^~~~~~~~~~~~~~~~~
> > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set':
> > drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration]
> >    46 |   tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset,
> >       |   ^~~~~~~~~~~~~~~~~~~~~
> > drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration]
> >    49 |   tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
> >       |   ^~~~~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap")
> > 
> > I have used the version of the mfd tree from next-20201104 for today.
> 
> Hi,
> 
> It's missing a patch for gpio part [1].
> 
> [1] https://lkml.org/lkml/2020/9/26/398

I'm aware of it.  Just waiting for Linus' reply.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-11-05  1:50 ` Stephen Rothwell
@ 2020-11-05  1:57   ` Michał Mirosław
  2020-11-05  9:09     ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Michał Mirosław @ 2020-11-05  1:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, Linus Walleij, Linux Kernel Mailing List,
	Linux Next Mailing List

On Thu, Nov 05, 2020 at 12:50:27PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the mfd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get':
> drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function 'tps65910_reg_read' [-Werror=implicit-function-declaration]
>    31 |  tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val);
>       |  ^~~~~~~~~~~~~~~~~
> drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set':
> drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration]
>    46 |   tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset,
>       |   ^~~~~~~~~~~~~~~~~~~~~
> drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration]
>    49 |   tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
>       |   ^~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap")
> 
> I have used the version of the mfd tree from next-20201104 for today.

Hi,

It's missing a patch for gpio part [1].

[1] https://lkml.org/lkml/2020/9/26/398

Best Regards
Michał Mirosław

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2020-11-05  1:50 ` Stephen Rothwell
  2020-11-05  1:57   ` Michał Mirosław
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2020-11-05  1:50 UTC (permalink / raw)
  To: Lee Jones
  Cc: Michał Mirosław, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

After merging the mfd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get':
drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function 'tps65910_reg_read' [-Werror=implicit-function-declaration]
   31 |  tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val);
      |  ^~~~~~~~~~~~~~~~~
drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set':
drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration]
   46 |   tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset,
      |   ^~~~~~~~~~~~~~~~~~~~~
drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration]
   49 |   tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
      |   ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap")

I have used the version of the mfd tree from next-20201104 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-07-17  6:59   ` Stephen Rothwell
@ 2020-07-17  7:11     ` Lee Jones
  0 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2020-07-17  7:11 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

On Fri, 17 Jul 2020, Stephen Rothwell wrote:

> Hi Lee,
> 
> On Fri, 17 Jul 2020 07:56:36 +0100 Lee Jones <lee.jones@linaro.org> wrote:
> >
> > > +static const char *kempld_devs[] = {  
> > 
> > Do you mind if I change this to 'kempld_dev_names' and still keep your
> > SoB?
> 
> No worries, I just did a quick hack, so if you neaten it up that would
> be good.

Great.  Thanks again.

Applied, thanks.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-07-17  6:56 ` Lee Jones
@ 2020-07-17  6:59   ` Stephen Rothwell
  2020-07-17  7:11     ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2020-07-17  6:59 UTC (permalink / raw)
  To: Lee Jones; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi Lee,

On Fri, 17 Jul 2020 07:56:36 +0100 Lee Jones <lee.jones@linaro.org> wrote:
>
> > +static const char *kempld_devs[] = {  
> 
> Do you mind if I change this to 'kempld_dev_names' and still keep your
> SoB?

No worries, I just did a quick hack, so if you neaten it up that would
be good.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-07-17  3:41 Stephen Rothwell
@ 2020-07-17  6:56 ` Lee Jones
  2020-07-17  6:59   ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2020-07-17  6:56 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

On Fri, 17 Jul 2020, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/kempld-core.c: In function 'kempld_register_cells_generic':
> drivers/mfd/kempld-core.c:105:13: error: assignment of read-only location 'devs[i++]'
>   105 |   devs[i++] = kempld_devs[KEMPLD_I2C];
>       |             ^
> drivers/mfd/kempld-core.c:108:13: error: assignment of read-only location 'devs[i++]'
>   108 |   devs[i++] = kempld_devs[KEMPLD_WDT];
>       |             ^
> drivers/mfd/kempld-core.c:111:13: error: assignment of read-only location 'devs[i++]'
>   111 |   devs[i++] = kempld_devs[KEMPLD_GPIO];
>       |             ^
> drivers/mfd/kempld-core.c:114:13: error: assignment of read-only location 'devs[i++]'
>   114 |   devs[i++] = kempld_devs[KEMPLD_UART];
>       |             ^
> 
> Caused by commit
> 
>   70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes")
> 
> I have added the following fix patch for today (I assume that there is
> a better solution):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 17 Jul 2020 13:36:22 +1000
> Subject: [PATCH] fix up for struct mfd_cell change
> 
> Fixes: 70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes")

Thanks for fixing this Stephen.

I need to investigate why this didn't show up during my own testing.
  
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/mfd/kempld-core.c | 28 ++++++++++------------------
>  1 file changed, 10 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
> index f48e21d8b97c..ad68ee699cb5 100644
> --- a/drivers/mfd/kempld-core.c
> +++ b/drivers/mfd/kempld-core.c
> @@ -79,39 +79,31 @@ enum kempld_cells {
>  	KEMPLD_UART,
>  };
>  
> -static const struct mfd_cell kempld_devs[] = {
> -	[KEMPLD_I2C] = {
> -		.name = "kempld-i2c",
> -	},
> -	[KEMPLD_WDT] = {
> -		.name = "kempld-wdt",
> -	},
> -	[KEMPLD_GPIO] = {
> -		.name = "kempld-gpio",
> -	},
> -	[KEMPLD_UART] = {
> -		.name = "kempld-uart",
> -	},
> +static const char *kempld_devs[] = {

Do you mind if I change this to 'kempld_dev_names' and still keep your
SoB?

> +	[KEMPLD_I2C] = "kempld-i2c",
> +	[KEMPLD_WDT] = "kempld-wdt",
> +	[KEMPLD_GPIO] = "kempld-gpio",
> +	[KEMPLD_UART] = "kempld-uart",
>  };
>  
>  #define KEMPLD_MAX_DEVS	ARRAY_SIZE(kempld_devs)
>  
>  static int kempld_register_cells_generic(struct kempld_device_data *pld)
>  {
> -	struct mfd_cell devs[KEMPLD_MAX_DEVS];
> +	struct mfd_cell devs[KEMPLD_MAX_DEVS] = {};
>  	int i = 0;
>  
>  	if (pld->feature_mask & KEMPLD_FEATURE_BIT_I2C)
> -		devs[i++] = kempld_devs[KEMPLD_I2C];
> +		devs[i++].name = kempld_devs[KEMPLD_I2C];
>  
>  	if (pld->feature_mask & KEMPLD_FEATURE_BIT_WATCHDOG)
> -		devs[i++] = kempld_devs[KEMPLD_WDT];
> +		devs[i++].name = kempld_devs[KEMPLD_WDT];
>  
>  	if (pld->feature_mask & KEMPLD_FEATURE_BIT_GPIO)
> -		devs[i++] = kempld_devs[KEMPLD_GPIO];
> +		devs[i++].name = kempld_devs[KEMPLD_GPIO];
>  
>  	if (pld->feature_mask & KEMPLD_FEATURE_MASK_UART)
> -		devs[i++] = kempld_devs[KEMPLD_UART];
> +		devs[i++].name = kempld_devs[KEMPLD_UART];
>  
>  	return mfd_add_devices(pld->dev, -1, devs, i, NULL, 0, NULL);
>  }



-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2020-07-17  3:41 Stephen Rothwell
  2020-07-17  6:56 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2020-07-17  3:41 UTC (permalink / raw)
  To: Lee Jones; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/kempld-core.c: In function 'kempld_register_cells_generic':
drivers/mfd/kempld-core.c:105:13: error: assignment of read-only location 'devs[i++]'
  105 |   devs[i++] = kempld_devs[KEMPLD_I2C];
      |             ^
drivers/mfd/kempld-core.c:108:13: error: assignment of read-only location 'devs[i++]'
  108 |   devs[i++] = kempld_devs[KEMPLD_WDT];
      |             ^
drivers/mfd/kempld-core.c:111:13: error: assignment of read-only location 'devs[i++]'
  111 |   devs[i++] = kempld_devs[KEMPLD_GPIO];
      |             ^
drivers/mfd/kempld-core.c:114:13: error: assignment of read-only location 'devs[i++]'
  114 |   devs[i++] = kempld_devs[KEMPLD_UART];
      |             ^

Caused by commit

  70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes")

I have added the following fix patch for today (I assume that there is
a better solution):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Jul 2020 13:36:22 +1000
Subject: [PATCH] fix up for struct mfd_cell change

Fixes: 70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mfd/kempld-core.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index f48e21d8b97c..ad68ee699cb5 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -79,39 +79,31 @@ enum kempld_cells {
 	KEMPLD_UART,
 };
 
-static const struct mfd_cell kempld_devs[] = {
-	[KEMPLD_I2C] = {
-		.name = "kempld-i2c",
-	},
-	[KEMPLD_WDT] = {
-		.name = "kempld-wdt",
-	},
-	[KEMPLD_GPIO] = {
-		.name = "kempld-gpio",
-	},
-	[KEMPLD_UART] = {
-		.name = "kempld-uart",
-	},
+static const char *kempld_devs[] = {
+	[KEMPLD_I2C] = "kempld-i2c",
+	[KEMPLD_WDT] = "kempld-wdt",
+	[KEMPLD_GPIO] = "kempld-gpio",
+	[KEMPLD_UART] = "kempld-uart",
 };
 
 #define KEMPLD_MAX_DEVS	ARRAY_SIZE(kempld_devs)
 
 static int kempld_register_cells_generic(struct kempld_device_data *pld)
 {
-	struct mfd_cell devs[KEMPLD_MAX_DEVS];
+	struct mfd_cell devs[KEMPLD_MAX_DEVS] = {};
 	int i = 0;
 
 	if (pld->feature_mask & KEMPLD_FEATURE_BIT_I2C)
-		devs[i++] = kempld_devs[KEMPLD_I2C];
+		devs[i++].name = kempld_devs[KEMPLD_I2C];
 
 	if (pld->feature_mask & KEMPLD_FEATURE_BIT_WATCHDOG)
-		devs[i++] = kempld_devs[KEMPLD_WDT];
+		devs[i++].name = kempld_devs[KEMPLD_WDT];
 
 	if (pld->feature_mask & KEMPLD_FEATURE_BIT_GPIO)
-		devs[i++] = kempld_devs[KEMPLD_GPIO];
+		devs[i++].name = kempld_devs[KEMPLD_GPIO];
 
 	if (pld->feature_mask & KEMPLD_FEATURE_MASK_UART)
-		devs[i++] = kempld_devs[KEMPLD_UART];
+		devs[i++].name = kempld_devs[KEMPLD_UART];
 
 	return mfd_add_devices(pld->dev, -1, devs, i, NULL, 0, NULL);
 }
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-02-04  7:53 ` Lee Jones
@ 2020-02-04 10:04   ` Srinivas Kandagatla
  0 siblings, 0 replies; 127+ messages in thread
From: Srinivas Kandagatla @ 2020-02-04 10:04 UTC (permalink / raw)
  To: Lee Jones, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Pierre-Louis Bossart



On 04/02/2020 07:53, Lee Jones wrote:
> On Tue, 04 Feb 2020, Stephen Rothwell wrote:
> 
>> Hi all,
>>
>> After merging the mfd tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> ld: sound/soc/codecs/wcd934x.o:(.toc+0x0): undefined reference to `of_clk_src_simple_get'
>> ld: sound/soc/codecs/wcd934x.o: in function `.wcd934x_codec_probe':
>> wcd934x.c:(.text.wcd934x_codec_probe+0x3d4): undefined reference to `.__clk_get_name'
>> ld: wcd934x.c:(.text.wcd934x_codec_probe+0x438): undefined reference to `.clk_hw_register'
>> ld: wcd934x.c:(.text.wcd934x_codec_probe+0x474): undefined reference to `.of_clk_add_provider'
> 
> What's the cause of this?  I thought PowerPC made use of the CCF?

Looks like the allyesconfig is not selecting COMMON_CLK for some reason,
and  SND_SOC_WCD934X is missing "depends on COMMON_CLK" in Kconfig

I will send a fix for that!


--srini

> 
>> Caused by commit
>>
>>    6ac7e4d7ad70 ("mfd: wcd934x: Add support to wcd9340/wcd9341 codec")
> 
> Looks to me like the Codec is broken, rather than the MFD driver.
> 
>> Unfortunately that commit is now in Linus' tree (and was never in
>> linux-next).
>>
>> I marked CONFIG_MFD_STMFX as BROKEN for now.
> 
> Surely that should be SND_SOC_WCD934X?
> 
> Srini,
> 
>    What do you plan to do about this?
> 

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2020-02-04  3:03 Stephen Rothwell
@ 2020-02-04  7:53 ` Lee Jones
  2020-02-04 10:04   ` Srinivas Kandagatla
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2020-02-04  7:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Srinivas Kandagatla, Pierre-Louis Bossart

On Tue, 04 Feb 2020, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> ld: sound/soc/codecs/wcd934x.o:(.toc+0x0): undefined reference to `of_clk_src_simple_get'
> ld: sound/soc/codecs/wcd934x.o: in function `.wcd934x_codec_probe':
> wcd934x.c:(.text.wcd934x_codec_probe+0x3d4): undefined reference to `.__clk_get_name'
> ld: wcd934x.c:(.text.wcd934x_codec_probe+0x438): undefined reference to `.clk_hw_register'
> ld: wcd934x.c:(.text.wcd934x_codec_probe+0x474): undefined reference to `.of_clk_add_provider'

What's the cause of this?  I thought PowerPC made use of the CCF?

> Caused by commit
> 
>   6ac7e4d7ad70 ("mfd: wcd934x: Add support to wcd9340/wcd9341 codec")

Looks to me like the Codec is broken, rather than the MFD driver.

> Unfortunately that commit is now in Linus' tree (and was never in
> linux-next).
> 
> I marked CONFIG_MFD_STMFX as BROKEN for now.

Surely that should be SND_SOC_WCD934X?

Srini,

  What do you plan to do about this?

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2020-02-04  3:03 Stephen Rothwell
  2020-02-04  7:53 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2020-02-04  3:03 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Srinivas Kandagatla, Pierre-Louis Bossart

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

Hi all,

After merging the mfd tree, today's linux-next build (powerpc
allyesconfig) failed like this:

ld: sound/soc/codecs/wcd934x.o:(.toc+0x0): undefined reference to `of_clk_src_simple_get'
ld: sound/soc/codecs/wcd934x.o: in function `.wcd934x_codec_probe':
wcd934x.c:(.text.wcd934x_codec_probe+0x3d4): undefined reference to `.__clk_get_name'
ld: wcd934x.c:(.text.wcd934x_codec_probe+0x438): undefined reference to `.clk_hw_register'
ld: wcd934x.c:(.text.wcd934x_codec_probe+0x474): undefined reference to `.of_clk_add_provider'

Caused by commit

  6ac7e4d7ad70 ("mfd: wcd934x: Add support to wcd9340/wcd9341 codec")

Unfortunately that commit is now in Linus' tree (and was never in
linux-next).

I marked CONFIG_MFD_STMFX as BROKEN for now.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2019-04-03  0:40 Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2019-04-03  0:40 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Vincent Palatin, Enric Balletbo i Serra, Wei-Ning Huang

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

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/cros_ec_dev.c: In function 'ec_device_probe':
drivers/mfd/cros_ec_dev.c:422:33: error: 'EC_FEATURE_FINGERPRINT' undeclared (first use in this function); did you mean 'EC_FEATURE_HANG_DETECT'?
  if (cros_ec_check_features(ec, EC_FEATURE_FINGERPRINT)) {
                                 ^~~~~~~~~~~~~~~~~~~~~~
                                 EC_FEATURE_HANG_DETECT
drivers/mfd/cros_ec_dev.c:422:33: note: each undeclared identifier is reported only once for each function it appears in
drivers/mfd/cros_ec_dev.c:445:33: error: 'EC_FEATURE_TOUCHPAD' undeclared (first use in this function); did you mean 'EC_FEATURE_USB_PD'?
  if (cros_ec_check_features(ec, EC_FEATURE_TOUCHPAD)) {
                                 ^~~~~~~~~~~~~~~~~~~
                                 EC_FEATURE_USB_PD

Caused by commits

  4483a6f22432 ("mfd: cros_ec: Instantiate properly CrOS FP MCU device")
  a03871b9e9ea ("mfd: cros_ec: Instantiate properly CrOS Touchpad MCU device")

I have used the mfd tree from next-20190402 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2018-12-17  5:38 Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2018-12-17  5:38 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Keerthy,
	Sebastian Reichel

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

Hi all,

After merging the mfd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/mfd/tps65218.c: In function 'tps65218_probe':
drivers/mfd/tps65218.c:247:3: error: label 'err_irq' used but not defined
   goto err_irq;
   ^~~~

Caused by commit

  05ba643fa2ce ("mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()")

I have used the mfd tree from next-20181214 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-12  8:13         ` Lee Jones
@ 2017-12-12 11:54           ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-12-12 11:54 UTC (permalink / raw)
  To: Lee Jones
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

Hi Lee,

On Tue, 12 Dec 2017 08:13:10 +0000 Lee Jones <lee.jones@linaro.org> wrote:
>
> Yes, it's in:
> 
>   next-20171212 as 51bd7125f740
> 
> Also, the pull request for it went out over a week ago:
> 
>   https://lkml.org/lkml/2017/12/4/142
> 
> What's missing?  Do you still see an issue with the build?

Sorry about that, my scripts have been applying the patch, but it
automerges and doesn't fail even though it ends up applying
nothing :-(  And I didn't notice :-( :-(

Thanks.  All good.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-12  2:13       ` Stephen Rothwell
@ 2017-12-12  8:13         ` Lee Jones
  2017-12-12 11:54           ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-12-12  8:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

On Tue, 12 Dec 2017, Stephen Rothwell wrote:

> Hi Lee,
> 
> On Wed, 6 Dec 2017 08:58:03 +0000 Lee Jones <lee.jones@linaro.org> wrote:
> >
> > On Wed, 06 Dec 2017, Stephen Rothwell wrote:
> > 
> > > On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones <lee.jones@linaro.org> wrote:  
> > > >  
> > > > > I added the following fix patch:
> > > > > 
> > > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > > Date: Mon, 4 Dec 2017 14:10:34 +1100
> > > > > Subject: [PATCH] misc: rtsx: fix symbol clashes
> > > > > 
> > > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>    
> > > > 
> > > > Although I'm not sure how to apply this manually without scissors.  
> > > 
> > > Just take everything from the From: line above to the end and give it
> > > to "git am".  Yes, this may involve saving the email and editting it,
> > > sorry about that.  
> > 
> > If you use the scissors, I can ask Git to deal with all that for me.
> > 
> > We like #lazymaintenance. :D
> 
> So is this going to be applied to the mfd tree?

Que?

Yes, it's in:

  next-20171212 as 51bd7125f740

Also, the pull request for it went out over a week ago:

  https://lkml.org/lkml/2017/12/4/142

What's missing?  Do you still see an issue with the build?

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-06  8:58     ` Lee Jones
@ 2017-12-12  2:13       ` Stephen Rothwell
  2017-12-12  8:13         ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2017-12-12  2:13 UTC (permalink / raw)
  To: Lee Jones
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

Hi Lee,

On Wed, 6 Dec 2017 08:58:03 +0000 Lee Jones <lee.jones@linaro.org> wrote:
>
> On Wed, 06 Dec 2017, Stephen Rothwell wrote:
> 
> > On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones <lee.jones@linaro.org> wrote:  
> > >  
> > > > I added the following fix patch:
> > > > 
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Mon, 4 Dec 2017 14:10:34 +1100
> > > > Subject: [PATCH] misc: rtsx: fix symbol clashes
> > > > 
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>    
> > > 
> > > Although I'm not sure how to apply this manually without scissors.  
> > 
> > Just take everything from the From: line above to the end and give it
> > to "git am".  Yes, this may involve saving the email and editting it,
> > sorry about that.  
> 
> If you use the scissors, I can ask Git to deal with all that for me.
> 
> We like #lazymaintenance. :D

So is this going to be applied to the mfd tree?

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-05 23:32   ` Stephen Rothwell
@ 2017-12-06  8:58     ` Lee Jones
  2017-12-12  2:13       ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-12-06  8:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

On Wed, 06 Dec 2017, Stephen Rothwell wrote:

> Hi Lee,
> 
> On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones <lee.jones@linaro.org> wrote:
> >
> > > I added the following fix patch:
> > > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 4 Dec 2017 14:10:34 +1100
> > > Subject: [PATCH] misc: rtsx: fix symbol clashes
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>  
> > 
> > Although I'm not sure how to apply this manually without scissors.
> 
> Just take everything from the From: line above to the end and give it
> to "git am".  Yes, this may involve saving the email and editting it,
> sorry about that.

If you use the scissors, I can ask Git to deal with all that for me.

We like #lazymaintenance. :D

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-04  9:39 ` Lee Jones
@ 2017-12-05 23:32   ` Stephen Rothwell
  2017-12-06  8:58     ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2017-12-05 23:32 UTC (permalink / raw)
  To: Lee Jones
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

Hi Lee,

On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones <lee.jones@linaro.org> wrote:
>
> > I added the following fix patch:
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 4 Dec 2017 14:10:34 +1100
> > Subject: [PATCH] misc: rtsx: fix symbol clashes
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>  
> 
> Although I'm not sure how to apply this manually without scissors.

Just take everything from the From: line above to the end and give it
to "git am".  Yes, this may involve saving the email and editting it,
sorry about that.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-04  3:19 Stephen Rothwell
  2017-12-04  9:10 ` Greg KH
@ 2017-12-04  9:39 ` Lee Jones
  2017-12-05 23:32   ` Stephen Rothwell
  1 sibling, 1 reply; 127+ messages in thread
From: Lee Jones @ 2017-12-04  9:39 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

On Mon, 04 Dec 2017, Stephen Rothwell wrote:

> Hi Lee,
> 
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
> (.text+0x5760): multiple definition of `.sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
> drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
> drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
> (.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
> drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here
> 
> 
> Caused by commit
> 
>   5da4e04ae480 ("misc: rtsx: Add support for RTS5260")
> 
> I added the following fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 4 Dec 2017 14:10:34 +1100
> Subject: [PATCH] misc: rtsx: fix symbol clashes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen.

Although I'm not sure how to apply this manually without scissors.

Might have to do so manually.

> ---
>  drivers/misc/cardreader/rts5260.c  | 4 ++--
>  drivers/misc/cardreader/rtsx_pcr.c | 4 ++--
>  drivers/misc/cardreader/rtsx_pcr.h | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
> index 3b308640282d..07cb93abf685 100644
> --- a/drivers/misc/cardreader/rts5260.c
> +++ b/drivers/misc/cardreader/rts5260.c
> @@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr)
>  	rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat);
>  	rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2);
>  	if (pcr->card_exist & SD_EXIST)
> -		sd_power_off_card3v3(pcr);
> +		rtsx_sd_power_off_card3v3(pcr);
>  	else if (pcr->card_exist & MS_EXIST)
> -		ms_power_off_card3v3(pcr);
> +		rtsx_ms_power_off_card3v3(pcr);
>  
>  	if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) {
>  		if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER |
> diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
> index 99adc67bbf73..5345170fc57b 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.c
> +++ b/drivers/misc/cardreader/rtsx_pcr.c
> @@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr)
>  	}
>  }
>  
> -int sd_power_off_card3v3(struct rtsx_pcr *pcr)
> +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr)
>  {
>  	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
>  		MS_CLK_EN | SD40_CLK_EN, 0);
> @@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr)
>  	return 0;
>  }
>  
> -int ms_power_off_card3v3(struct rtsx_pcr *pcr)
> +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr)
>  {
>  	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
>  		MS_CLK_EN | SD40_CLK_EN, 0);
> diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
> index c544e35d0154..6ea1655db0bb 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.h
> +++ b/drivers/misc/cardreader/rtsx_pcr.h
> @@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr);
>  void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr);
>  int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val);
>  void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr);
> -int sd_power_off_card3v3(struct rtsx_pcr *pcr);
> -int ms_power_off_card3v3(struct rtsx_pcr *pcr);
> +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr);
> +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr);
>  
>  #endif

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-12-04  3:19 Stephen Rothwell
@ 2017-12-04  9:10 ` Greg KH
  2017-12-04  9:39 ` Lee Jones
  1 sibling, 0 replies; 127+ messages in thread
From: Greg KH @ 2017-12-04  9:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, Linux-Next Mailing List, Linux Kernel Mailing List,
	Rui Feng, Daniel Bristot de Oliveira, Perry Yuan

On Mon, Dec 04, 2017 at 02:19:56PM +1100, Stephen Rothwell wrote:
> Hi Lee,
> 
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
> (.text+0x5760): multiple definition of `.sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
> drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
> drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
> (.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
> drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here
> 
> 
> Caused by commit
> 
>   5da4e04ae480 ("misc: rtsx: Add support for RTS5260")
> 
> I added the following fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 4 Dec 2017 14:10:34 +1100
> Subject: [PATCH] misc: rtsx: fix symbol clashes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/misc/cardreader/rts5260.c  | 4 ++--
>  drivers/misc/cardreader/rtsx_pcr.c | 4 ++--
>  drivers/misc/cardreader/rtsx_pcr.h | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2017-12-04  3:19 Stephen Rothwell
  2017-12-04  9:10 ` Greg KH
  2017-12-04  9:39 ` Lee Jones
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-12-04  3:19 UTC (permalink / raw)
  To: Lee Jones, Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rui Feng,
	Daniel Bristot de Oliveira, Perry Yuan

Hi Lee,

After merging the mfd tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
(.text+0x5760): multiple definition of `.sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
(.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here


Caused by commit

  5da4e04ae480 ("misc: rtsx: Add support for RTS5260")

I added the following fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 4 Dec 2017 14:10:34 +1100
Subject: [PATCH] misc: rtsx: fix symbol clashes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/cardreader/rts5260.c  | 4 ++--
 drivers/misc/cardreader/rtsx_pcr.c | 4 ++--
 drivers/misc/cardreader/rtsx_pcr.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
index 3b308640282d..07cb93abf685 100644
--- a/drivers/misc/cardreader/rts5260.c
+++ b/drivers/misc/cardreader/rts5260.c
@@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr)
 	rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat);
 	rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2);
 	if (pcr->card_exist & SD_EXIST)
-		sd_power_off_card3v3(pcr);
+		rtsx_sd_power_off_card3v3(pcr);
 	else if (pcr->card_exist & MS_EXIST)
-		ms_power_off_card3v3(pcr);
+		rtsx_ms_power_off_card3v3(pcr);
 
 	if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) {
 		if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER |
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index 99adc67bbf73..5345170fc57b 100644
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr)
 	}
 }
 
-int sd_power_off_card3v3(struct rtsx_pcr *pcr)
+int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr)
 {
 	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
 		MS_CLK_EN | SD40_CLK_EN, 0);
@@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr)
 	return 0;
 }
 
-int ms_power_off_card3v3(struct rtsx_pcr *pcr)
+int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr)
 {
 	rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
 		MS_CLK_EN | SD40_CLK_EN, 0);
diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
index c544e35d0154..6ea1655db0bb 100644
--- a/drivers/misc/cardreader/rtsx_pcr.h
+++ b/drivers/misc/cardreader/rtsx_pcr.h
@@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr);
 void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr);
 int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val);
 void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr);
-int sd_power_off_card3v3(struct rtsx_pcr *pcr);
-int ms_power_off_card3v3(struct rtsx_pcr *pcr);
+int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr);
+int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr);
 
 #endif
-- 
2.15.0

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-05-31  2:23 Stephen Rothwell
  2017-05-31  3:36 ` Stephen Rothwell
@ 2017-06-05  3:28 ` Stephen Rothwell
  1 sibling, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-06-05  3:28 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Greg Kroah-Hartman, Kuppuswamy Sathyanarayanan

Hi Lee,

On Wed, 31 May 2017 12:23:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr
> obe':
> drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no member named 'irq_chip_data_level2'
>   ret = regmap_irq_get_virq(pmic->irq_chip_data_level2,
>                                 ^
> 
> Caused by commit
> 
>   aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level irq chips")
> 
> interacting with commit
> 
>   d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY")
> 
> from Linus' tree (v4.12-rc1).  grep is your friend. :-)
> 
> I have used the mfd tree from next-20170530 for today.

I am still getting this failure.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2017-05-31  2:23 Stephen Rothwell
@ 2017-05-31  3:36 ` Stephen Rothwell
  2017-06-05  3:28 ` Stephen Rothwell
  1 sibling, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-05-31  3:36 UTC (permalink / raw)
  To: Darren Hart
  Cc: Lee Jones, Linux-Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Greg Kroah-Hartman, Kuppuswamy Sathyanarayanan

Hi Darren,

On Wed, 31 May 2017 12:23:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr
> obe':
> drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no member named 'irq_chip_data_level2'
>   ret = regmap_irq_get_virq(pmic->irq_chip_data_level2,
>                                 ^
> 
> Caused by commit
> 
>   aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level irq chips")
> 
> interacting with commit
> 
>   d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY")
> 
> from Linus' tree (v4.12-rc1).  grep is your friend. :-)
> 
> I have used the mfd tree from next-20170530 for today.

This also affected the drivers-x86 tree, so I have use the version of
that from next-20170530 as well.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2017-05-31  2:23 Stephen Rothwell
  2017-05-31  3:36 ` Stephen Rothwell
  2017-06-05  3:28 ` Stephen Rothwell
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2017-05-31  2:23 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Greg Kroah-Hartman, Kuppuswamy Sathyanarayanan

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr
obe':
drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no member named 'irq_chip_data_level2'
  ret = regmap_irq_get_virq(pmic->irq_chip_data_level2,
                                ^

Caused by commit

  aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level irq chips")

interacting with commit

  d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY")

from Linus' tree (v4.12-rc1).  grep is your friend. :-)

I have used the mfd tree from next-20170530 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2016-03-01  1:35   ` Kuninori Morimoto
@ 2016-03-02  4:00     ` Mark Brown
  0 siblings, 0 replies; 127+ messages in thread
From: Mark Brown @ 2016-03-02  4:00 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Stephen Rothwell, Lee Jones, Liam Girdwood, linux-next, linux-kernel

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

On Tue, Mar 01, 2016 at 01:35:58AM +0000, Kuninori Morimoto wrote:

> I noticed that you reborned regmap_write_bits() on your latest tree.
> I think using/adding regmap_force_update_bits() is good idea IMO.
> Can I create such patch ?

It might make more sense to rename _force_update_bits() to
_write_bits().

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2016-03-01  1:19 ` Kuninori Morimoto
@ 2016-03-01  1:35   ` Kuninori Morimoto
  2016-03-02  4:00     ` Mark Brown
  0 siblings, 1 reply; 127+ messages in thread
From: Kuninori Morimoto @ 2016-03-01  1:35 UTC (permalink / raw)
  To: Mark Brown
  Cc: Stephen Rothwell, Lee Jones, Liam Girdwood, linux-next, linux-kernel


Hi Mark

I noticed that you reborned regmap_write_bits() on your latest tree.
I think using/adding regmap_force_update_bits() is good idea IMO.
Can I create such patch ?

> Oops, it is my fault. Can you check/test this patch ?
> 
> ----------------
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Date: Tue, 1 Mar 2016 10:12:20 +0900
> Subject: [PATCH] regmap: add regmap_force_update_bits()
> 
> commit 23b92e4c ("regmap: remove regmap_write_bits()")
> removed regmap_write_bits(), we can use regmap_force_update_bits()
> instead of it.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  drivers/regulator/tps65086-regulator.c | 2 +-
>  include/linux/regmap.h                 | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
> index 33f389d..e78b688 100644
> --- a/drivers/regulator/tps65086-regulator.c
> +++ b/drivers/regulator/tps65086-regulator.c
> @@ -191,7 +191,7 @@ static int tps65086_of_parse_cb(struct device_node *dev,
>  
>  	/* Check for decay mode */
>  	if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {
> -		ret = regmap_write_bits(config->regmap,
> +		ret = regmap_force_update_bits(config->regmap,
>  					regulators[desc->id].decay_reg,
>  					regulators[desc->id].decay_mask,
>  					regulators[desc->id].decay_mask);
> diff --git a/include/linux/regmap.h b/include/linux/regmap.h
> index 7449792..d6cde49 100644
> --- a/include/linux/regmap.h
> +++ b/include/linux/regmap.h
> @@ -67,6 +67,8 @@ struct reg_sequence {
>  
>  #define	regmap_update_bits(map, reg, mask, val) \
>  	regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
> +#define	regmap_force_update_bits(map, reg, mask, val) \
> +	regmap_update_bits_base(map, reg, mask, val, NULL, false, true)
>  #define	regmap_update_bits_async(map, reg, mask, val)\
>  	regmap_update_bits_base(map, reg, mask, val, NULL, true, false)
>  #define	regmap_update_bits_check(map, reg, mask, val, change)\
> -- 
> ----------------
> 
> 
> Best regards
> ---
> Kuninori Morimoto

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2016-02-29  3:51 Stephen Rothwell
@ 2016-03-01  1:19 ` Kuninori Morimoto
  2016-03-01  1:35   ` Kuninori Morimoto
  0 siblings, 1 reply; 127+ messages in thread
From: Kuninori Morimoto @ 2016-03-01  1:19 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, Mark Brown, Liam Girdwood, linux-next, linux-kernel


Hi Stephen, Lee

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/regulator/tps65086-regulator.c:194:9: error: implicit declaration of function 'regmap_write_bits' [-Werror=implicit-function-declaration]
>    ret = regmap_write_bits(config->regmap,
>          ^
> 
> Caused by commit
> 
>   23b92e4cf5fd ("regmap: remove regmap_write_bits()")
> 
> from the sound-asoc & regmap trees.
> 
> I am not sure why this is suddenly exposed by the mfd tree, but grep
> would have been useful when the regmap tree patch was applied.
> 
> I have reverted that regmap commit for today.

Oops, it is my fault. Can you check/test this patch ?

----------------
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 1 Mar 2016 10:12:20 +0900
Subject: [PATCH] regmap: add regmap_force_update_bits()

commit 23b92e4c ("regmap: remove regmap_write_bits()")
removed regmap_write_bits(), we can use regmap_force_update_bits()
instead of it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/regulator/tps65086-regulator.c | 2 +-
 include/linux/regmap.h                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
index 33f389d..e78b688 100644
--- a/drivers/regulator/tps65086-regulator.c
+++ b/drivers/regulator/tps65086-regulator.c
@@ -191,7 +191,7 @@ static int tps65086_of_parse_cb(struct device_node *dev,
 
 	/* Check for decay mode */
 	if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {
-		ret = regmap_write_bits(config->regmap,
+		ret = regmap_force_update_bits(config->regmap,
 					regulators[desc->id].decay_reg,
 					regulators[desc->id].decay_mask,
 					regulators[desc->id].decay_mask);
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 7449792..d6cde49 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -67,6 +67,8 @@ struct reg_sequence {
 
 #define	regmap_update_bits(map, reg, mask, val) \
 	regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
+#define	regmap_force_update_bits(map, reg, mask, val) \
+	regmap_update_bits_base(map, reg, mask, val, NULL, false, true)
 #define	regmap_update_bits_async(map, reg, mask, val)\
 	regmap_update_bits_base(map, reg, mask, val, NULL, true, false)
 #define	regmap_update_bits_check(map, reg, mask, val, change)\
-- 
----------------


Best regards
---
Kuninori Morimoto

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2016-02-29  3:51 Stephen Rothwell
  2016-03-01  1:19 ` Kuninori Morimoto
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2016-02-29  3:51 UTC (permalink / raw)
  To: Lee Jones, Mark Brown, Liam Girdwood
  Cc: linux-next, linux-kernel, Kuninori Morimoto

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/regulator/tps65086-regulator.c:194:9: error: implicit declaration of function 'regmap_write_bits' [-Werror=implicit-function-declaration]
   ret = regmap_write_bits(config->regmap,
         ^

Caused by commit

  23b92e4cf5fd ("regmap: remove regmap_write_bits()")

from the sound-asoc & regmap trees.

I am not sure why this is suddenly exposed by the mfd tree, but grep
would have been useful when the regmap tree patch was applied.

I have reverted that regmap commit for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-16  1:27       ` Stephen Rothwell
@ 2015-10-16 10:10         ` Arnd Bergmann
  0 siblings, 0 replies; 127+ messages in thread
From: Arnd Bergmann @ 2015-10-16 10:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Lee Jones, linux-next, linux-kernel, Andy Shevchenko

On Friday 16 October 2015 12:27:04 Stephen Rothwell wrote:
> Hi Arnd,
> 
> On Thu, 15 Oct 2015 14:28:20 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
> > new file mode 100644
> > index 000000000000..32b73abce1b0
> > --- /dev/null
> > +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
> > @@ -0,0 +1,2 @@
> > +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
> > +#include <linux/io-64-nonatomic-hi-lo.h>
> 
> Turns out you need the same for io-64-nonatomic-lo-hi.h as well ...
> 
> 


D'oh!

fixed now, thanks for your patience.

	Arnd

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15 12:28     ` Arnd Bergmann
@ 2015-10-16  1:27       ` Stephen Rothwell
  2015-10-16 10:10         ` Arnd Bergmann
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2015-10-16  1:27 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Christoph Hellwig, Lee Jones, linux-next, linux-kernel, Andy Shevchenko

Hi Arnd,

On Thu, 15 Oct 2015 14:28:20 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
> new file mode 100644
> index 000000000000..32b73abce1b0
> --- /dev/null
> +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
> @@ -0,0 +1,2 @@
> +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
> +#include <linux/io-64-nonatomic-hi-lo.h>

Turns out you need the same for io-64-nonatomic-lo-hi.h as well ...

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15 12:04   ` Christoph Hellwig
@ 2015-10-15 12:28     ` Arnd Bergmann
  2015-10-16  1:27       ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Arnd Bergmann @ 2015-10-15 12:28 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Stephen Rothwell, Lee Jones, linux-next, linux-kernel, Andy Shevchenko

On Thursday 15 October 2015 14:04:07 Christoph Hellwig wrote:
> On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote:
> > The patch looks good, should we do something to prevent that from
> > becoming a problem when Linus pulls our branches?
> > 
> > This commit is at the bottom of my asm-generic git tree, so Lee could merge
> > that one commit into his tree and fix up the merge correctly.
> > 
> > However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
> > has the same problem, so maybe it's better to add a temporary file
> > with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>",
> > which I will remove in the following merge window or as a follow-up.
> 
> I guess we really need that.  Do you want to do a quick fixup or should I send
> a patch?

I've applied this one now.

	Arnd

>From b3d8d0ee6c9781d54d4180c5f1d36a12f0437c86 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Oct 2015 14:24:45 +0200
Subject: [PATCH] asm-generic: temporarily add back
 asm-generic/io-64-nonatomic-hi-lo.h

New users of this file still start showing up in linux-next, so it's
better to have a migration strategy. All existing users as of 4.3-rc4
are converted to use linux/io-64-nonatomic-hi-lo.h, and after 4.4-rc1
we can change all the new ones that have come in since, and then
remove this file again.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: LKP project <lkp@linux.intel.com>

diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
new file mode 100644
index 000000000000..32b73abce1b0
--- /dev/null
+++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
@@ -0,0 +1,2 @@
+/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
+#include <linux/io-64-nonatomic-hi-lo.h>

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15  8:59 ` Arnd Bergmann
  2015-10-15  9:17   ` Lee Jones
  2015-10-15  9:45   ` Andy Shevchenko
@ 2015-10-15 12:04   ` Christoph Hellwig
  2015-10-15 12:28     ` Arnd Bergmann
  2 siblings, 1 reply; 127+ messages in thread
From: Christoph Hellwig @ 2015-10-15 12:04 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Stephen Rothwell, Lee Jones, linux-next, linux-kernel,
	Andy Shevchenko, Christoph Hellwig

On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote:
> The patch looks good, should we do something to prevent that from
> becoming a problem when Linus pulls our branches?
> 
> This commit is at the bottom of my asm-generic git tree, so Lee could merge
> that one commit into his tree and fix up the merge correctly.
> 
> However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
> has the same problem, so maybe it's better to add a temporary file
> with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>",
> which I will remove in the following merge window or as a follow-up.

I guess we really need that.  Do you want to do a quick fixup or should I send
a patch?

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15  8:59 ` Arnd Bergmann
  2015-10-15  9:17   ` Lee Jones
@ 2015-10-15  9:45   ` Andy Shevchenko
  2015-10-15 12:04   ` Christoph Hellwig
  2 siblings, 0 replies; 127+ messages in thread
From: Andy Shevchenko @ 2015-10-15  9:45 UTC (permalink / raw)
  To: Arnd Bergmann, Stephen Rothwell
  Cc: Lee Jones, linux-next, linux-kernel, Christoph Hellwig

On Thu, 2015-10-15 at 10:59 +0200, Arnd Bergmann wrote:
> > 

> On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote:
> However, I also now see that 
> drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
> has the same problem, so maybe it's better to add a temporary file
> with the old name containing "#include <linux/io-64-nonatomic-lo
> -hi.h>",
> which I will remove in the following merge window or as a follow-up.
> 
> Yet another way would be for me to wait until Linus has pulled both
> mfd and netdev been merged, and I'll let him know of the conflict
> in my pull request.

There are at least couple of drivers where I introduced a use of
lo_hi_* helpers (idma64.c and xhci header if the latter made Greg's
tree). Though didn't check if it's should be fixed.

For me looks like temporary (for one cycle) file might be a better work
around.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15  8:59 ` Arnd Bergmann
@ 2015-10-15  9:17   ` Lee Jones
  2015-10-15  9:45   ` Andy Shevchenko
  2015-10-15 12:04   ` Christoph Hellwig
  2 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2015-10-15  9:17 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Stephen Rothwell, linux-next, linux-kernel, Andy Shevchenko,
	Christoph Hellwig

On Thu, 15 Oct 2015, Arnd Bergmann wrote:

> On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote:
> > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/mfd/intel-lpss.c:29:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
> >  #include <asm-generic/io-64-nonatomic-lo-hi.h>
> >                                                ^
> > 
> > Caused by commit
> > 
> >   6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper")
> > 
> > interacting with commit
> > 
> >   f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")
> > 
> > from the asm-generic tree.
> > 
> > I have added the following merge fix patch and can carry it as necessary.
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 15 Oct 2015 13:23:20 +1100
> > Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic"
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> The patch looks good, should we do something to prevent that from
> becoming a problem when Linus pulls our branches?
> 
> This commit is at the bottom of my asm-generic git tree, so Lee could merge
> that one commit into his tree and fix up the merge correctly.
> 
> However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
> has the same problem, so maybe it's better to add a temporary file
> with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>",
> which I will remove in the following merge window or as a follow-up.
> 
> Yet another way would be for me to wait until Linus has pulled both
> mfd and netdev been merged, and I'll let him know of the conflict
> in my pull request.

I'll remain flexible.  Whatever you think is the best solution we'll
go with and I'll facilitate.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15  2:26 Stephen Rothwell
  2015-10-15  3:35 ` kbuild test robot
@ 2015-10-15  8:59 ` Arnd Bergmann
  2015-10-15  9:17   ` Lee Jones
                     ` (2 more replies)
  1 sibling, 3 replies; 127+ messages in thread
From: Arnd Bergmann @ 2015-10-15  8:59 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, linux-next, linux-kernel, Andy Shevchenko, Christoph Hellwig

On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote:
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/intel-lpss.c:29:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
>  #include <asm-generic/io-64-nonatomic-lo-hi.h>
>                                                ^
> 
> Caused by commit
> 
>   6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper")
> 
> interacting with commit
> 
>   f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")
> 
> from the asm-generic tree.
> 
> I have added the following merge fix patch and can carry it as necessary.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 15 Oct 2015 13:23:20 +1100
> Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

The patch looks good, should we do something to prevent that from
becoming a problem when Linus pulls our branches?

This commit is at the bottom of my asm-generic git tree, so Lee could merge
that one commit into his tree and fix up the merge correctly.

However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
has the same problem, so maybe it's better to add a temporary file
with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>",
which I will remove in the following merge window or as a follow-up.

Yet another way would be for me to wait until Linus has pulled both
mfd and netdev been merged, and I'll let him know of the conflict
in my pull request.

	Arnd

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-10-15  2:26 Stephen Rothwell
@ 2015-10-15  3:35 ` kbuild test robot
  2015-10-15  8:59 ` Arnd Bergmann
  1 sibling, 0 replies; 127+ messages in thread
From: kbuild test robot @ 2015-10-15  3:35 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: kbuild-all, Lee Jones, Arnd Bergmann, linux-next, linux-kernel,
	Andy Shevchenko, Christoph Hellwig

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

Hi Stephen,

[auto build test ERROR on next-20151013 -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

url:    https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-build-failure-after-merge-of-the-mfd-tree/20151015-102814
config: i386-allmodconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

>> drivers/mfd/intel-lpss.c:28:41: fatal error: linux/io-64-nonatomic-lo-hi.h: No such file or directory
   compilation terminated.

vim +28 drivers/mfd/intel-lpss.c

    22	#include <linux/kernel.h>
    23	#include <linux/module.h>
    24	#include <linux/mfd/core.h>
    25	#include <linux/pm_qos.h>
    26	#include <linux/pm_runtime.h>
    27	#include <linux/seq_file.h>
  > 28	#include <linux/io-64-nonatomic-lo-hi.h>
    29	
    30	#include "intel-lpss.h"
    31	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 52194 bytes --]

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2015-10-15  2:26 Stephen Rothwell
  2015-10-15  3:35 ` kbuild test robot
  2015-10-15  8:59 ` Arnd Bergmann
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2015-10-15  2:26 UTC (permalink / raw)
  To: Lee Jones, Arnd Bergmann
  Cc: linux-next, linux-kernel, Andy Shevchenko, Christoph Hellwig

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/intel-lpss.c:29:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
                                               ^

Caused by commit

  6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper")

interacting with commit

  f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")

from the asm-generic tree.

I have added the following merge fix patch and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Oct 2015 13:23:20 +1100
Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mfd/intel-lpss.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 001a7d7708ce..6255513f54c7 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -25,8 +25,7 @@
 #include <linux/pm_qos.h>
 #include <linux/pm_runtime.h>
 #include <linux/seq_file.h>
-
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #include "intel-lpss.h"
 
-- 
2.5.1

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

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-03-04  0:34 Stephen Rothwell
  2015-03-04  0:37 ` Stephen Rothwell
@ 2015-03-04  7:26 ` Sascha Hauer
  1 sibling, 0 replies; 127+ messages in thread
From: Sascha Hauer @ 2015-03-04  7:26 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Lee Jones, linux-next, linux-kernel, Flora Fu

Hi Stephen,

On Wed, Mar 04, 2015 at 11:34:29AM +1100, Stephen Rothwell wrote:
> Hi Lee,
> 
> After merging the mfd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/mfd/mt6397-core.c: In function 'mt6397_irq_domain_map':
> drivers/mfd/mt6397-core.c:124:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration]
>   set_irq_flags(irq, IRQF_VALID);
>   ^
> drivers/mfd/mt6397-core.c:124:21: error: 'IRQF_VALID' undeclared (first use in this function)
>   set_irq_flags(irq, IRQF_VALID);
>                      ^
> drivers/mfd/mt6397-core.c:124:21: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit 06d1bcedc888 ("mfd: Add support for the MediaTek
> MT6397 PMIC").
> 
> I have used the mfd tree from next-20150303 for today.

Thanks for noting. I have just sent a patch fixing this.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2015-03-04  0:34 Stephen Rothwell
@ 2015-03-04  0:37 ` Stephen Rothwell
  2015-03-04  7:26 ` Sascha Hauer
  1 sibling, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2015-03-04  0:37 UTC (permalink / raw)
  To: Lee Jones; +Cc: linux-next, linux-kernel, Sascha Hauer

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

Hi all,

On Wed, 4 Mar 2015 11:34:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mfd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

My email to Flora Fu <flora.fu@mediatek.com> bounced:

<flora.fu@mediatek.com>: host mailgw02.mediatek.com[210.61.82.184] said: 550
    Relaying mail to flora.fu@mediatek.com is not allowed (in reply to RCPT TO
    command)

So someone might like to let Flora Fu know.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2015-03-04  0:34 Stephen Rothwell
  2015-03-04  0:37 ` Stephen Rothwell
  2015-03-04  7:26 ` Sascha Hauer
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2015-03-04  0:34 UTC (permalink / raw)
  To: Lee Jones; +Cc: linux-next, linux-kernel, Flora Fu, Sascha Hauer

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

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mfd/mt6397-core.c: In function 'mt6397_irq_domain_map':
drivers/mfd/mt6397-core.c:124:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration]
  set_irq_flags(irq, IRQF_VALID);
  ^
drivers/mfd/mt6397-core.c:124:21: error: 'IRQF_VALID' undeclared (first use in this function)
  set_irq_flags(irq, IRQF_VALID);
                     ^
drivers/mfd/mt6397-core.c:124:21: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit 06d1bcedc888 ("mfd: Add support for the MediaTek
MT6397 PMIC").

I have used the mfd tree from next-20150303 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2014-11-11  2:32 Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2014-11-11  2:32 UTC (permalink / raw)
  To: Lee Jones; +Cc: linux-next, linux-kernel, Gyungoh Yoo

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

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/mfd/sky81452.c:29:0:
include/linux/mfd/sky81452.h:24:52: fatal error: linux/platform_data/sky81452-backlight.h: No such file or directory
 #include <linux/platform_data/sky81452-backlight.h>
                                                    ^

Caused by commit f4eaf386bcf1 ("mfd: Add support for Skyworks SKY81452
driver").

I have used the mfd tree from next-20141110 for today.

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

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2014-11-04  7:54 ` Krzysztof Kozlowski
@ 2014-11-04  8:09   ` Lee Jones
  0 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2014-11-04  8:09 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Stephen Rothwell, linux-next, linux-kernel, Javier Martinez Canillas

On Tue, 04 Nov 2014, Krzysztof Kozlowski wrote:
> On wto, 2014-11-04 at 16:40 +1100, Stephen Rothwell wrote:
> > 
> > After merging the mfd tree, today's linux-next build (powerpc allyesconfig)
> > failed like this:

[Crash, bang, wallop]

> > And so on ...
> > 
> > Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for
> > board files") from the mfd tree.
> > 
> > I reverted that commit for today.
> 
> The commit depends on other patches from a set which hadn't been
> applied. Please drop it.

It is done!

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2014-11-04  5:40 Stephen Rothwell
@ 2014-11-04  7:54 ` Krzysztof Kozlowski
  2014-11-04  8:09   ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Krzysztof Kozlowski @ 2014-11-04  7:54 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, linux-next, linux-kernel, Javier Martinez Canillas

On wto, 2014-11-04 at 16:40 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the mfd tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
> 
> drivers/regulator/max77686.c:432:13: warning: 'struct max77686_platform_data' declared inside parameter list
>       struct max77686_platform_data *pdata)
>              ^
> drivers/regulator/max77686.c:432:13: warning: its scope is only this definition or declaration, which is probably not what you want
> drivers/regulator/max77686.c: In function 'max77686_pmic_dt_parse_pdata':
> drivers/regulator/max77686.c:447:7: error: dereferencing pointer to incomplete type
>   pdata->num_regulators = ARRAY_SIZE(regulators);
>        ^
> drivers/regulator/max77686.c:448:42: error: dereferencing pointer to incomplete type
>   rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
>                                           ^
> drivers/regulator/max77686.c:449:14: error: dereferencing pointer to incomplete type
>          pdata->num_regulators, GFP_KERNEL);
>               ^
> drivers/regulator/max77686.c:455:23: error: dereferencing pointer to incomplete type
>   for (i = 0; i < pdata->num_regulators; i++) {
>                        ^
> drivers/regulator/max77686.c:460:3: error: invalid use of undefined type 'struct max77686_regulator_data'
>    rdata[i].initdata = rmatch.init_data;
>    ^
> drivers/regulator/max77686.c:460:8: error: dereferencing pointer to incomplete type
>    rdata[i].initdata = rmatch.init_data;
>         ^
> drivers/regulator/max77686.c:461:3: error: invalid use of undefined type 'struct max77686_regulator_data'
>    rdata[i].of_node = rmatch.of_node;
>    ^
> drivers/regulator/max77686.c:461:8: error: dereferencing pointer to incomplete type
>    rdata[i].of_node = rmatch.of_node;
>         ^
> drivers/regulator/max77686.c:464:7: error: dereferencing pointer to incomplete type
>   pdata->regulators = rdata;
>        ^
> 
> And so on ...
> 
> Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for
> board files") from the mfd tree.
> 
> I reverted that commit for today.

The commit depends on other patches from a set which hadn't been
applied. Please drop it.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2014-11-04  5:40 Stephen Rothwell
  2014-11-04  7:54 ` Krzysztof Kozlowski
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2014-11-04  5:40 UTC (permalink / raw)
  To: Lee Jones
  Cc: linux-next, linux-kernel, Krzysztof Kozlowski, Javier Martinez Canillas

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

Hi all,

After merging the mfd tree, today's linux-next build (powerpc allyesconfig)
failed like this:

drivers/regulator/max77686.c:432:13: warning: 'struct max77686_platform_data' declared inside parameter list
      struct max77686_platform_data *pdata)
             ^
drivers/regulator/max77686.c:432:13: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/regulator/max77686.c: In function 'max77686_pmic_dt_parse_pdata':
drivers/regulator/max77686.c:447:7: error: dereferencing pointer to incomplete type
  pdata->num_regulators = ARRAY_SIZE(regulators);
       ^
drivers/regulator/max77686.c:448:42: error: dereferencing pointer to incomplete type
  rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
                                          ^
drivers/regulator/max77686.c:449:14: error: dereferencing pointer to incomplete type
         pdata->num_regulators, GFP_KERNEL);
              ^
drivers/regulator/max77686.c:455:23: error: dereferencing pointer to incomplete type
  for (i = 0; i < pdata->num_regulators; i++) {
                       ^
drivers/regulator/max77686.c:460:3: error: invalid use of undefined type 'struct max77686_regulator_data'
   rdata[i].initdata = rmatch.init_data;
   ^
drivers/regulator/max77686.c:460:8: error: dereferencing pointer to incomplete type
   rdata[i].initdata = rmatch.init_data;
        ^
drivers/regulator/max77686.c:461:3: error: invalid use of undefined type 'struct max77686_regulator_data'
   rdata[i].of_node = rmatch.of_node;
   ^
drivers/regulator/max77686.c:461:8: error: dereferencing pointer to incomplete type
   rdata[i].of_node = rmatch.of_node;
        ^
drivers/regulator/max77686.c:464:7: error: dereferencing pointer to incomplete type
  pdata->regulators = rdata;
       ^

And so on ...

Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for
board files") from the mfd tree.

I reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2014-08-22 16:56 Stephen Rothwell
@ 2014-08-22 19:09 ` Lee Jones
  0 siblings, 0 replies; 127+ messages in thread
From: Lee Jones @ 2014-08-22 19:09 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown, Charles Keepax

On Sat, 23 Aug 2014, Stephen Rothwell wrote:

> Hi Lee,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "wm8994_base_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
> ERROR: "wm8994_irq_init" [drivers/mfd/wm8994-core.ko] undefined!
> ERROR: "wm1811_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
> ERROR: "wm8958_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
> ERROR: "wm8994_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
> 
> Presumably caused by commit a3ee6a4e2729 ("mfd: wm8994: Allow modular
> build").
> 
> I have used the mfd tree from next-20140822 for today.

I fixed this at 10 o'clock this morning?

When did you pull?

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2014-08-22 16:56 Stephen Rothwell
  2014-08-22 19:09 ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2014-08-22 16:56 UTC (permalink / raw)
  To: Lee Jones; +Cc: linux-next, linux-kernel, Mark Brown, Charles Keepax

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

Hi Lee,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "wm8994_base_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
ERROR: "wm8994_irq_init" [drivers/mfd/wm8994-core.ko] undefined!
ERROR: "wm1811_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
ERROR: "wm8958_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!
ERROR: "wm8994_regmap_config" [drivers/mfd/wm8994-core.ko] undefined!

Presumably caused by commit a3ee6a4e2729 ("mfd: wm8994: Allow modular
build").

I have used the mfd tree from next-20140822 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-09 16:50             ` Rob Herring
@ 2013-04-09 20:51               ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2013-04-09 20:51 UTC (permalink / raw)
  To: Rob Herring; +Cc: Alexander Shiyan, Stephen Rothwell, linux-next, linux-kernel

Hi Rob,

On Tue, Apr 09, 2013 at 11:50:30AM -0500, Rob Herring wrote:
> On Tue, Apr 9, 2013 at 11:12 AM, Samuel Ortiz <sameo@linux.intel.com> wrote:
> >
> > On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote:
> >> > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote:
> 
> [...]
> 
> >> From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001
> >> From: Alexander Shiyan <shc_work@mail.ru>
> >> Date: Tue, 9 Apr 2013 19:41:27 +0400
> >> Subject: [PATCH] of: add stub of_get_parent for non-OF builds
> >>
> >> Fixes build error on x86_64 allmodconfig, introduced by commit
> >> 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> >>
> >> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> >> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> >>
> >> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> >> ---
> >>  include/linux/of.h | 5 +++++
> >>  1 file changed, 5 insertions(+)
> >>
> >> diff --git a/include/linux/of.h b/include/linux/of.h
> >> index a0f1292..9f5923f 100644
> >> --- a/include/linux/of.h
> >> +++ b/include/linux/of.h
> >> @@ -353,6 +353,11 @@ static inline struct device_node *of_find_node_by_name(struct device_node *from,
> >>       return NULL;
> >>  }
> >>
> >> +static inline struct device_node *of_get_parent(const struct device_node *node)
> >> +{
> >> +     return NULL;
> >> +}
> >> +
> > That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for
> > it before merging it. Please look at MAINTAINERS and cc them on this thread.
> 
> Acked-by: Rob Herring <rob.herring@calxeda.com>
Thanks, I am pushing this patch through the mfd-next tree.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-09 16:12           ` Samuel Ortiz
@ 2013-04-09 16:50             ` Rob Herring
  2013-04-09 20:51               ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Rob Herring @ 2013-04-09 16:50 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: Alexander Shiyan, Stephen Rothwell, linux-next, linux-kernel

On Tue, Apr 9, 2013 at 11:12 AM, Samuel Ortiz <sameo@linux.intel.com> wrote:
> Hi Alexander,
>
> On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote:
>> > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote:

[...]

>> From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001
>> From: Alexander Shiyan <shc_work@mail.ru>
>> Date: Tue, 9 Apr 2013 19:41:27 +0400
>> Subject: [PATCH] of: add stub of_get_parent for non-OF builds
>>
>> Fixes build error on x86_64 allmodconfig, introduced by commit
>> 5ab3a89a741f ("mfd: syscon: Add non-DT support").
>>
>> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
>> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
>>
>> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
>> ---
>>  include/linux/of.h | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/include/linux/of.h b/include/linux/of.h
>> index a0f1292..9f5923f 100644
>> --- a/include/linux/of.h
>> +++ b/include/linux/of.h
>> @@ -353,6 +353,11 @@ static inline struct device_node *of_find_node_by_name(struct device_node *from,
>>       return NULL;
>>  }
>>
>> +static inline struct device_node *of_get_parent(const struct device_node *node)
>> +{
>> +     return NULL;
>> +}
>> +
> That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for
> it before merging it. Please look at MAINTAINERS and cc them on this thread.

Acked-by: Rob Herring <rob.herring@calxeda.com>

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-09 15:47         ` Re[2]: " Alexander Shiyan
@ 2013-04-09 16:12           ` Samuel Ortiz
  2013-04-09 16:50             ` Rob Herring
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2013-04-09 16:12 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: Stephen Rothwell, linux-next, linux-kernel

Hi Alexander,

On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote:
> > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote:
> > > > > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > > > > > failed like this:
> > > > > > 
> > > > > > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> > > > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> > > > > > 
> > > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> > > > > > 
> > > > > > I have used the mfd tree from next-20130405 for today.
> > > > > 
> > > > > This means that we do not have empty declarations for the
> > > > > of_xx functions in linux/of.h for !CONFIG_OF.
> > > > > OK to declare these functions or any other opinions?
> > > > Ok with me, but you'd need to get Grant and Rob's ACK.
> ...
> > > Subject: [PATCH] regulator: anatop: Make select dependency from
> > >  HAVE_IMX_ANATOP symbol
> > > 
> > > This patch make selection of anatop-regulator from HAVE_IMX_ANATOP
> > > kernel symbol. This fixes build kernel with syscon driver but without
> > > oftree support.
> ...
> > This does look like a band-aid solution to me. Yes, it will fix the crash, but
> > you're restricting this code to a much smaller architecture set. AFAIK
> > linux-next is not tested on that arch, for example.
> 
> OK, the second solution:
> 
> From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001
> From: Alexander Shiyan <shc_work@mail.ru>
> Date: Tue, 9 Apr 2013 19:41:27 +0400
> Subject: [PATCH] of: add stub of_get_parent for non-OF builds
> 
> Fixes build error on x86_64 allmodconfig, introduced by commit
> 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> 
> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  include/linux/of.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/include/linux/of.h b/include/linux/of.h
> index a0f1292..9f5923f 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -353,6 +353,11 @@ static inline struct device_node *of_find_node_by_name(struct device_node *from,
>  	return NULL;
>  }
>  
> +static inline struct device_node *of_get_parent(const struct device_node *node)
> +{
> +	return NULL;
> +}
> +
That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for
it before merging it. Please look at MAINTAINERS and cc them on this thread.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-08 16:27     ` Re[2]: " Alexander Shiyan
@ 2013-04-09  7:20       ` Samuel Ortiz
  2013-04-09 15:47         ` Re[2]: " Alexander Shiyan
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2013-04-09  7:20 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: Stephen Rothwell, linux-next, linux-kernel

Hi Alexander,

On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote:
> > > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > > > failed like this:
> > > > 
> > > > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> > > > 
> > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> > > > 
> > > > I have used the mfd tree from next-20130405 for today.
> > > 
> > > This means that we do not have empty declarations for the
> > > of_xx functions in linux/of.h for !CONFIG_OF.
> > > OK to declare these functions or any other opinions?
> > Ok with me, but you'd need to get Grant and Rob's ACK.
> 
> I've revised my initial opinion and write ​​a quick patch for fix this issue.
> 
> From a884d309d2978cbc44c52b650d669e56fef664e2 Mon Sep 17 00:00:00 2001
> From: Alexander Shiyan <shc_work@mail.ru>
> Date: Mon, 8 Apr 2013 19:13:10 +0400
> Subject: [PATCH] regulator: anatop: Make select dependency from
>  HAVE_IMX_ANATOP symbol
> 
> This patch make selection of anatop-regulator from HAVE_IMX_ANATOP
> kernel symbol. This fixes build kernel with syscon driver but without
> oftree support.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  drivers/regulator/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
> index a5d97ea..078932d 100644
> --- a/drivers/regulator/Kconfig
> +++ b/drivers/regulator/Kconfig
> @@ -133,7 +133,7 @@ config REGULATOR_FAN53555
>  
>  config REGULATOR_ANATOP
>  	tristate "Freescale i.MX on-chip ANATOP LDO regulators"
> -	depends on MFD_SYSCON
> +	depends on HAVE_IMX_ANATOP
This does look like a band-aid solution to me. Yes, it will fix the crash, but
you're restricting this code to a much smaller architecture set. AFAIK
linux-next is not tested on that arch, for example.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-08  4:45 ` Alexander Shiyan
@ 2013-04-08  9:22   ` Samuel Ortiz
  2013-04-08 16:27     ` Re[2]: " Alexander Shiyan
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2013-04-08  9:22 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: Stephen Rothwell, linux-next, linux-kernel

Hi Alexander,

On Mon, Apr 08, 2013 at 08:45:51AM +0400, Alexander Shiyan wrote:
> Hello.
> 
> > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> > 
> > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> > 
> > I have used the mfd tree from next-20130405 for today.
> 
> This means that we do not have empty declarations for the
> of_xx functions in linux/of.h for !CONFIG_OF.
> OK to declare these functions or any other opinions?
Ok with me, but you'd need to get Grant and Rob's ACK.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2013-04-08  4:21 Stephen Rothwell
@ 2013-04-08  4:45 ` Alexander Shiyan
  2013-04-08  9:22   ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Alexander Shiyan @ 2013-04-08  4:45 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

Hello.

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]
> 
> Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support").
> 
> I have used the mfd tree from next-20130405 for today.

This means that we do not have empty declarations for the
of_xx functions in linux/of.h for !CONFIG_OF.
OK to declare these functions or any other opinions?

---

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2013-04-08  4:21 Stephen Rothwell
  2013-04-08  4:45 ` Alexander Shiyan
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2013-04-08  4:21 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Alexander Shiyan

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe':
drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration]

Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support").

I have used the mfd tree from next-20130405 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-09-25  3:47 Stephen Rothwell
  2012-09-25  6:47 ` Matthias Kaehlcke
@ 2012-09-25  8:43 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-09-25  8:43 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Matthias Kaehlcke

Hi Stephen,

On Tue, Sep 25, 2012 at 01:47:35PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol 'platform_driver_unregister'
> 
> Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver").
> 
> I have used the mfd tree from next-20120924 for today.
Thanks for the heads up, it's all fixed now.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-09-25  3:47 Stephen Rothwell
@ 2012-09-25  6:47 ` Matthias Kaehlcke
  2012-09-25  8:43 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Matthias Kaehlcke @ 2012-09-25  6:47 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

Hi Stephen,

El Tue, Sep 25, 2012 at 01:47:35PM +1000 Stephen Rothwell ha dit:

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol 'platform_driver_unregister'
> 
> Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver").
> 
> I have used the mfd tree from next-20120924 for today.

the module license of that driver is "GPLv2", apparently this should
be "GPL v2". for testing i used a built-in driver, so i didn't see the
problem.

i will submit a patch with the corrected license string later this day

best regards

-- 
Matthias Kaehlcke
Embedded Linux Developer
Amsterdam

               The only power to which man should aspire
                is that which he exercises over himself
                            (Elie Wiesel)
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-09-25  3:47 Stephen Rothwell
  2012-09-25  6:47 ` Matthias Kaehlcke
  2012-09-25  8:43 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2012-09-25  3:47 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Matthias Kaehlcke

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol 'platform_driver_unregister'

Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver").

I have used the mfd tree from next-20120924 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-07-09  3:57 Stephen Rothwell
  2012-07-09 10:52 ` Samuel Ortiz
@ 2012-07-10  9:20 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-07-10  9:20 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown

Hi Stephen,

On Mon, Jul 09, 2012 at 01:57:19PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined!
> ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined!
> ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined!
> ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined!
> 
> I have used the mfd tree from next-20120706 for today.
The mfd and sound trees are now fixed and you should no longer get those
failures.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-07-09  3:57 Stephen Rothwell
@ 2012-07-09 10:52 ` Samuel Ortiz
  2012-07-10  9:20 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-07-09 10:52 UTC (permalink / raw)
  To: Stephen Rothwell, Mark Brown; +Cc: linux-next, linux-kernel

Hi Stephen, Mark,

On Mon, Jul 09, 2012 at 01:57:19PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined!
> ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined!
> ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined!
> ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined!
> ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined!
>
I pushed a patch that fixes the following build failures:

ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined!
ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined!
ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined!

This one:

ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined!

comes from the fact that arizon_dai_ops is not an exported symbol while
snd-soc-wm5102 is built as a module. This is coming from Mark's sound tree.

Cheers,
Samuel.


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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-07-09  3:57 Stephen Rothwell
  2012-07-09 10:52 ` Samuel Ortiz
  2012-07-10  9:20 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2012-07-09  3:57 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mark Brown

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined!
ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined!
ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined!
ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined!
ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined!

I have used the mfd tree from next-20120706 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-22 22:52                 ` Stephen Rothwell
@ 2012-05-23 14:34                   ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-05-23 14:34 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, Linus Walleij, Mark Brown, linux-next, linux-kernel

Hi Stephen,

On Wed, May 23, 2012 at 08:52:26AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> On Wed, 23 May 2012 00:42:14 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
> >
> > I would appreciate if we could have a fix for this one sooner than later as
> > I'm planning to send my pull request by the end of this week.
> 
> Just so you know, nothing you have added to your tree since May 11 has
> been in linux-next due to 3 separate build problems.  As far as I can see
> the same will be true today due to the problem you were discussing here.
I applied a fix for this one, and a couple of other commits for 2 more build
failures. The mfd tree should build fine now.
Sorry for the delay.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-22 22:42               ` Samuel Ortiz
@ 2012-05-22 22:52                 ` Stephen Rothwell
  2012-05-23 14:34                   ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-22 22:52 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: Lee Jones, Linus Walleij, Mark Brown, linux-next, linux-kernel

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

Hi Samuel,

On Wed, 23 May 2012 00:42:14 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> I would appreciate if we could have a fix for this one sooner than later as
> I'm planning to send my pull request by the end of this week.

Just so you know, nothing you have added to your tree since May 11 has
been in linux-next due to 3 separate build problems.  As far as I can see
the same will be true today due to the problem you were discussing here.

You quickest way forward may be to either revert commit d28f1db8187d
("mfd: Remove confusing ab8500-i2c file and merge into ab8500-core") (if
possible) or make the building of drivers/mfd/ab8500-core.c depend on
some platform where it is clear it will build.

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

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21 10:28             ` Lee Jones
@ 2012-05-22 22:42               ` Samuel Ortiz
  2012-05-22 22:52                 ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2012-05-22 22:42 UTC (permalink / raw)
  To: Lee Jones, Linus Walleij
  Cc: Mark Brown, Stephen Rothwell, linux-next, linux-kernel

Hi Lee,

On Mon, May 21, 2012 at 11:28:23AM +0100, Lee Jones wrote:
> When CONFIG_AB8500_CORE is set, building ab8500-core.c and
> !(CONFIG_UX500_SOC_DB8500 | CONFIG_MFD_DB8500_PRCMU), both
> db8500-prcmu.h and dbx500-prcmu.h take it upon themselves to _both_
> create 'return 0' inline functions for the following:
> 
> prcmu_abb_read()
> prcmu_abb_write()
> prcmu_config_clkout()
> prcmu_ac_wake_req()
> prcmu_ac_sleep_req()
> 
> I think we need a Kconfig rule to prevent this from happening, but
> I'm not sure what the correct logic would be. 
Do you want the above routines to be NOOPs when !CONFIG_MFD_DB8500_PRCMU or
when !CONFIG_UX500_SOC_DB8500 ? It would make more sense to define them as
NOOP when !CONFIG_MFD_DB8500_PRCMU and remove all those definitions from
dbx500-prmcu.h
But I may be missing some of your architecture dependencies.

Something like that:

diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index d7674eb..8515547 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -366,12 +366,8 @@ static inline void prcmu_get_abb_event_buffer(void __iomem **buf)
 		db8500_prcmu_get_abb_event_buffer(buf);
 }
 
-int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
-int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
 int prcmu_abb_write_masked(u8 slave, u8 reg, u8 *value, u8 *mask, u8 size);
 
-int prcmu_config_clkout(u8 clkout, u8 source, u8 div);
-
 static inline int prcmu_request_clock(u8 clock, bool enable)
 {
 	if (cpu_is_u5500())
@@ -447,8 +443,6 @@ static inline u16 prcmu_get_reset_code(void)
 		return db8500_prcmu_get_reset_code();
 }
 
-void prcmu_ac_wake_req(void);
-void prcmu_ac_sleep_req(void);
 static inline void prcmu_modem_reset(void)
 {
 	if (cpu_is_u5500())
@@ -611,27 +605,12 @@ static inline void prcmu_enable_wakeups(u32 wakeups) {}
 
 static inline void prcmu_disable_wakeups(void) {}
 
-static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
-{
-	return -ENOSYS;
-}
-
-static inline int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
-{
-	return -ENOSYS;
-}
-
 static inline int prcmu_abb_write_masked(u8 slave, u8 reg, u8 *value, u8 *mask,
 	u8 size)
 {
 	return -ENOSYS;
 }
 
-static inline int prcmu_config_clkout(u8 clkout, u8 source, u8 div)
-{
-	return 0;
-}
-
 static inline int prcmu_request_clock(u8 clock, bool enable)
 {
 	return 0;
@@ -689,10 +668,6 @@ static inline u16 prcmu_get_reset_code(void)
 	return 0;
 }
 
-static inline void prcmu_ac_wake_req(void) {}
-
-static inline void prcmu_ac_sleep_req(void) {}
-
 static inline void prcmu_modem_reset(void) {}
 
 static inline bool prcmu_is_ac_wake_requested(void)

I would appreciate if we could have a fix for this one sooner than later as
I'm planning to send my pull request by the end of this week.

Cheers,
Samuel.

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

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  9:54           ` Mark Brown
@ 2012-05-21 10:28             ` Lee Jones
  2012-05-22 22:42               ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2012-05-21 10:28 UTC (permalink / raw)
  To: Mark Brown
  Cc: Stephen Rothwell, Samuel Ortiz, linux-next, linux-kernel, Linus Walleij

> Since there's no dependencies which would stop it being selected
> anything like allyesconfig or randconfig might enable it.  In general
> it's normal to allow this in order to make it easier to build test
> things like subsystem wide changes.

Ah, I see. In which case Stephen was correct in that it's an issue with 
Kconfig logic (but not an issue with the patch alluded to). I'm going to 
have to pass this one over to Linus (CC'ed), as it's his train-set and I 
don't want to do the wrong thing.

Linus,

When CONFIG_AB8500_CORE is set, building ab8500-core.c and 
!(CONFIG_UX500_SOC_DB8500 | CONFIG_MFD_DB8500_PRCMU), both 
db8500-prcmu.h and dbx500-prcmu.h take it upon themselves to _both_ 
create 'return 0' inline functions for the following:

prcmu_abb_read()
prcmu_abb_write()
prcmu_config_clkout()
prcmu_ac_wake_req()
prcmu_ac_sleep_req()

I think we need a Kconfig rule to prevent this from happening, but I'm 
not sure what the correct logic would be. The other option would be to 
explicitly include db8500-prcmu.h instead of dbx500-prcmu.h in 
ab0500-core.c (which in turn includes db8500-prcmu.h (and used to 
include db5500-prcmu.h)), but this seems wrong to me.

As you have a clearer insight to these things would you care to take 
this on?

Kind regards,
Lee

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  9:19         ` Lee Jones
@ 2012-05-21  9:54           ` Mark Brown
  2012-05-21 10:28             ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Mark Brown @ 2012-05-21  9:54 UTC (permalink / raw)
  To: Lee Jones; +Cc: Stephen Rothwell, Samuel Ortiz, linux-next, linux-kernel

On Mon, May 21, 2012 at 10:19:32AM +0100, Lee Jones wrote:
> > include/linux/mfd/abx500/ab8500-sysctrl.h:#endif /* CONFIG_AB8500_CORE */
> 
> > drivers/mfd/Makefile:obj-$(CONFIG_AB8500_CORE)  += ab8500-core.o ab8500-sysctrl.o

> So somewhere along the line an X86 config is selecting CONFIG_AB8500_CORE when it shouldn't. 

> I can't see anything relevant in my tree. I'll try to pull yours as have a look.

Since there's no dependencies which would stop it being selected
anything like allyesconfig or randconfig might enable it.  In general
it's normal to allow this in order to make it easier to build test
things like subsystem wide changes.

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  9:10       ` Stephen Rothwell
@ 2012-05-21  9:19         ` Lee Jones
  2012-05-21  9:54           ` Mark Brown
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2012-05-21  9:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

On 21/05/12 10:10, Stephen Rothwell wrote:
> Hi Lee,
> 
> On Mon, 21 May 2012 10:01:20 +0100 Lee Jones<lee.jones@linaro.org>  wrote:
>>
>> That seems broken to me.
>>
>> Why would any of the X86_64 systems be building ab8500-core code?
> 
> Because the Kconfig allows it to ...

I think the issue may be on the x86 side. In -next I see:

> arch/arm/configs/u8500_defconfig:CONFIG_AB8500_CORE=y
> drivers/mfd/Kconfig:config AB8500_CORE

Expected

> drivers/gpio/Kconfig:           depends on AB8500_CORE && BROKEN
> drivers/input/misc/Kconfig:     depends on AB8500_CORE
> drivers/mfd/Kconfig:            depends on AB8500_CORE && MFD_DB8500_PRCMU
> drivers/mfd/Kconfig:            depends on AB8500_CORE && DEBUG_FS
> drivers/mfd/Kconfig:            depends on AB8500_CORE && REGULATOR_AB8500
> drivers/misc/Kconfig:           depends on AB8500_CORE && ARCH_U8500
> drivers/power/Kconfig:          depends on AB8500_CORE && AB8500_GPADC
> drivers/regulator/Kconfig:      depends on AB8500_CORE
> drivers/rtc/Kconfig:            depends on AB8500_CORE
> drivers/usb/otg/Kconfig:        depends on AB8500_CORE

I've just checked these, they are all AB8500 related Kconfig entries.

> include/linux/mfd/abx500/ab8500-sysctrl.h:#ifdef CONFIG_AB8500_CORE
> include/linux/mfd/abx500/ab8500-sysctrl.h:#endif /* CONFIG_AB8500_CORE */

> drivers/mfd/Makefile:obj-$(CONFIG_AB8500_CORE)  += ab8500-core.o ab8500-sysctrl.o

So somewhere along the line an X86 config is selecting CONFIG_AB8500_CORE when it shouldn't. 

I can't see anything relevant in my tree. I'll try to pull yours as have a look.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515 
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  9:01     ` Lee Jones
@ 2012-05-21  9:10       ` Stephen Rothwell
  2012-05-21  9:19         ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-21  9:10 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, linux-next, linux-kernel

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

Hi Lee,

On Mon, 21 May 2012 10:01:20 +0100 Lee Jones <lee.jones@linaro.org> wrote:
>
> That seems broken to me.
> 
> Why would any of the X86_64 systems be building ab8500-core code?

Because the Kconfig allows it to ...

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

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  8:30 ` Lee Jones
@ 2012-05-21  9:07   ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-21  9:07 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, linux-next, linux-kernel

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

Hi Lee,

On Mon, 21 May 2012 09:30:47 +0100 Lee Jones <lee.jones@linaro.org> wrote:
>
> > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > In file included from drivers/mfd/ab8500-core.c:21:0:
> > include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
> > include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
> > include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
> > include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
> > include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
> > include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
> > include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
> > include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
> > include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
> > include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here
> >
> > Caused (exposed?) by commit d28f1db8187d ("mfd: Remove confusing
> > ab8500-i2c file and merge into ab8500-core").  I assume that this has
> > only had very restricted build testing :-(
> 
> I 'believe' that you 'might' be missing MFD_DB8500_PRCMU from your 
> config. Can you check this for me please Stephen?

That is not relevent to the config I am building ...

> Can I ask how you build the kernel and which defconfig you are using please?

Its an X86_64 allmodconfig build.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  8:40   ` Stephen Rothwell
@ 2012-05-21  9:01     ` Lee Jones
  2012-05-21  9:10       ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Lee Jones @ 2012-05-21  9:01 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

On 21/05/12 09:40, Stephen Rothwell wrote:
> Hi Lee,
>
> On Mon, 21 May 2012 09:08:56 +0100 Lee Jones<lee.jones@linaro.org>  wrote:
>>
>> The patch itself has had extensive build and run testing, with DT both
>> enabled and disabled. I'm guessing some other changes may be having and
>> influence here. I'm happy to take a look for you. Can you tell me where
>> I can pull the offending branch from please?
>
> The mfd tree can be found here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
>
> Did you try building it for X86_64?  What failed for me was an x86_64
> allmodconfig.

That seems broken to me.

Why would any of the X86_64 systems be building ab8500-core code?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  8:08 ` Lee Jones
@ 2012-05-21  8:40   ` Stephen Rothwell
  2012-05-21  9:01     ` Lee Jones
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-21  8:40 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, linux-next, linux-kernel

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

Hi Lee,

On Mon, 21 May 2012 09:08:56 +0100 Lee Jones <lee.jones@linaro.org> wrote:
>
> The patch itself has had extensive build and run testing, with DT both 
> enabled and disabled. I'm guessing some other changes may be having and 
> influence here. I'm happy to take a look for you. Can you tell me where 
> I can pull the offending branch from please?

The mfd tree can be found here:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next

Did you try building it for X86_64?  What failed for me was an x86_64
allmodconfig.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  3:42 Stephen Rothwell
  2012-05-21  8:08 ` Lee Jones
@ 2012-05-21  8:30 ` Lee Jones
  2012-05-21  9:07   ` Stephen Rothwell
  1 sibling, 1 reply; 127+ messages in thread
From: Lee Jones @ 2012-05-21  8:30 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/mfd/ab8500-core.c:21:0:
> include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
> include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
> include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
> include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
> include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
> include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
> include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
> include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
> include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
> include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here
>
> Caused (exposed?) by commit d28f1db8187d ("mfd: Remove confusing
> ab8500-i2c file and merge into ab8500-core").  I assume that this has
> only had very restricted build testing :-(

I 'believe' that you 'might' be missing MFD_DB8500_PRCMU from your 
config. Can you check this for me please Stephen?

MFD_DB8500_PRCMU is selected by
UX500_SOC_DB8500 is selected by
MACH_MOP500 is selected by
MACH_HREFV60 | MACH_SNOWBALL is selected by
u8500_defconfig

Can I ask how you build the kernel and which defconfig you are using please?

Kind regards,
Lee

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-21  3:42 Stephen Rothwell
@ 2012-05-21  8:08 ` Lee Jones
  2012-05-21  8:40   ` Stephen Rothwell
  2012-05-21  8:30 ` Lee Jones
  1 sibling, 1 reply; 127+ messages in thread
From: Lee Jones @ 2012-05-21  8:08 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

Hi Stephen,

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/mfd/ab8500-core.c:21:0:
> include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
> include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
> include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
> include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
> include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
> include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
> include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
> include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
> include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
> include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here
>
> Caused (exposed?) by commit d28f1db8187d ("mfd: Remove confusing
> ab8500-i2c file and merge into ab8500-core").  I assume that this has
> only had very restricted build testing :-(

The patch itself has had extensive build and run testing, with DT both 
enabled and disabled. I'm guessing some other changes may be having and 
influence here. I'm happy to take a look for you. Can you tell me where 
I can pull the offending branch from please?

Kind regards,
Lee

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-05-21  3:42 Stephen Rothwell
  2012-05-21  8:08 ` Lee Jones
  2012-05-21  8:30 ` Lee Jones
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-21  3:42 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Lee Jones

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from drivers/mfd/ab8500-core.c:21:0:
include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here

Caused (exposed?) by commit d28f1db8187d ("mfd: Remove confusing
ab8500-i2c file and merge into ab8500-core").  I assume that this has
only had very restricted build testing :-(

I have used the mfd tree from next-20120511 again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-16  6:09 Stephen Rothwell
@ 2012-05-18  8:39 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-05-18  8:39 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown

Hi Stephen,

On Wed, May 16, 2012 at 04:09:06PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/built-in.o: In function `wm8400_i2c_probe':
> wm8400-core.c:(.text+0x100165): undefined reference to `devm_regmap_init_i2c'
> drivers/built-in.o: In function `wm8400_module_init':
> wm8400-core.c:(.init.text+0xb43c): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `wm8400_module_exit':
> wm8400-core.c:(.exit.text+0x655): undefined reference to `i2c_del_driver'
> 
> Probably caused by commit 96cd102ae039 ("mfd: Don't support non-modular
> wm8400 build") which was introduced to fix other problems.  In this
> build, CONFIG_I2C=m and CONFIG_REGMAP_I2C=m.
> 
> I have used the mfd tree from next-20120511 again for today.
Sorry for the delay, this should be fixed now.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-05-16  6:09 Stephen Rothwell
  2012-05-18  8:39 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-16  6:09 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mark Brown

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/built-in.o: In function `wm8400_i2c_probe':
wm8400-core.c:(.text+0x100165): undefined reference to `devm_regmap_init_i2c'
drivers/built-in.o: In function `wm8400_module_init':
wm8400-core.c:(.init.text+0xb43c): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `wm8400_module_exit':
wm8400-core.c:(.exit.text+0x655): undefined reference to `i2c_del_driver'

Probably caused by commit 96cd102ae039 ("mfd: Don't support non-modular
wm8400 build") which was introduced to fix other problems.  In this
build, CONFIG_I2C=m and CONFIG_REGMAP_I2C=m.

I have used the mfd tree from next-20120511 again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-05-14  3:37 Stephen Rothwell
@ 2012-05-14 20:22 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-05-14 20:22 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown

Hi Stephen,

On Mon, May 14, 2012 at 01:37:53PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "wm8400_block_read" [drivers/regulator/wm8400-regulator.ko] undefined!
> ERROR: "regmap_reinit_cache" [drivers/mfd/wm8400-core.ko] undefined!
> 
> Caused by commit 4d240045599c ("mfd: Remove wm8400 custom cache
> implementation").
> 
> I have used the mfd tree from next-20120511 for today.
This should be fixed now, thanks to Mark patches.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-05-14  3:37 Stephen Rothwell
  2012-05-14 20:22 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-05-14  3:37 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mark Brown

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "wm8400_block_read" [drivers/regulator/wm8400-regulator.ko] undefined!
ERROR: "regmap_reinit_cache" [drivers/mfd/wm8400-core.ko] undefined!

Caused by commit 4d240045599c ("mfd: Remove wm8400 custom cache
implementation").

I have used the mfd tree from next-20120511 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-03-19  2:13 Stephen Rothwell
  2012-03-19  6:19 ` Laxman Dewangan
@ 2012-03-20 12:40 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-03-20 12:40 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Laxman Dewangan

Hi Stephen,

On Mon, Mar 19, 2012 at 01:13:45PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/built-in.o: In function `rc5t583_i2c_init':
> rc5t583.c:(.init.text+0xb3db): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `rc5t583_i2c_probe':
> rc5t583.c:(.devinit.text+0x8fa0): undefined reference to `regmap_init_i2c'
> drivers/built-in.o: In function `rc5t583_i2c_exit':
> rc5t583.c:(.exit.text+0x708): undefined reference to `i2c_del_driver'
> 
> Caused by commit 1b1247dd75aa ("mfd: Add support for RICOH PMIC
> RC5T583"). Presumably some missing Kconfig dependency.
> 
> I have ued the version of the mfd tree from next-20120316 for today.
This should be fixed now, thanks for the heads up.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-03-19  2:13 Stephen Rothwell
@ 2012-03-19  6:19 ` Laxman Dewangan
  2012-03-20 12:40 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Laxman Dewangan @ 2012-03-19  6:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

Hi Stephen,

On Monday 19 March 2012 07:43 AM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Samuel,
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/built-in.o: In function `rc5t583_i2c_init':
> rc5t583.c:(.init.text+0xb3db): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `rc5t583_i2c_probe':
> rc5t583.c:(.devinit.text+0x8fa0): undefined reference to `regmap_init_i2c'
> drivers/built-in.o: In function `rc5t583_i2c_exit':
> rc5t583.c:(.exit.text+0x708): undefined reference to `i2c_del_driver'
>
> Caused by commit 1b1247dd75aa ("mfd: Add support for RICOH PMIC
> RC5T583"). Presumably some missing Kconfig dependency.
>
> I have ued the version of the mfd tree from next-20120316 for today.

Sorry for inconvenience.
I sent the patch for fixing the issue as
[PATCH V1] mfd: rc5t583: Build only if I2C config is selected to y.

The issue which I saw is that if CONFIG_I2C=m then also rx5t583.c is 
gettign compiled and so generating the linking error.
With fix, compiling only if the CONFIG_i2C=y.

The change is  as follows:

--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -849,7 +849,7 @@ config MFD_INTEL_MSIC

  config MFD_RC5T583
         bool "Ricoh RC5T583 Power Management system device"
-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C=y && GENERIC_HARDIRQS
         select MFD_CORE
         select REGMAP_I2C
         help

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-03-19  2:13 Stephen Rothwell
  2012-03-19  6:19 ` Laxman Dewangan
  2012-03-20 12:40 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2012-03-19  2:13 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Laxman Dewangan

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/built-in.o: In function `rc5t583_i2c_init':
rc5t583.c:(.init.text+0xb3db): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `rc5t583_i2c_probe':
rc5t583.c:(.devinit.text+0x8fa0): undefined reference to `regmap_init_i2c'
drivers/built-in.o: In function `rc5t583_i2c_exit':
rc5t583.c:(.exit.text+0x708): undefined reference to `i2c_del_driver'

Caused by commit 1b1247dd75aa ("mfd: Add support for RICOH PMIC
RC5T583"). Presumably some missing Kconfig dependency.

I have ued the version of the mfd tree from next-20120316 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2012-02-21  1:31 Stephen Rothwell
@ 2012-02-21 11:32 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2012-02-21 11:32 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Peter Ujfalusi

Hi Stephen,

On Tue, Feb 21, 2012 at 12:31:17PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
Although this patchset will most likely go through Liam's ASoC tree, I pushed
Peter fix on mine for now.
So it should build fine now.

Thanks for the heads up.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2012-02-21  1:31 Stephen Rothwell
  2012-02-21 11:32 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2012-02-21  1:31 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Peter Ujfalusi

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/built-in.o: In function `twl6040_driver_init':
twl6040-core.c:(.init.text+0xb147): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `twl6040_probe':
twl6040-core.c:(.devinit.text+0x7f22): undefined reference to `regmap_init_i2c'
drivers/built-in.o: In function `twl6040_driver_exit':
twl6040-core.c:(.exit.text+0x67a): undefined reference to `i2c_del_driver'


Caused by commit ded0df851077 ("mfd: Convert twl6040 to an i2c driver,
and separate it from twl core").

I have used the mfd tree from next-20120220 for today.

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

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-12-20  3:17 Stephen Rothwell
@ 2011-12-20 17:37 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2011-12-20 17:37 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Viresh Kumar

Hi Stephen,

On Tue, Dec 20, 2011 at 02:17:31PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/built-in.o: In function `i2c_block_write':
> stmpe-i2c.c:(.text+0xf4553): undefined reference to `i2c_smbus_write_i2c_block_data'
> drivers/built-in.o: In function `i2c_block_read':
> stmpe-i2c.c:(.text+0xf457f): undefined reference to `i2c_smbus_read_i2c_block_data'
> drivers/built-in.o: In function `i2c_reg_write':
> stmpe-i2c.c:(.text+0xf45ab): undefined reference to `i2c_smbus_write_byte_data'
> drivers/built-in.o: In function `i2c_reg_read':
> stmpe-i2c.c:(.text+0xf45d4): undefined reference to `i2c_smbus_read_byte_data'
> drivers/built-in.o: In function `stmpe_init':
> stmpe-i2c.c:(.init.text+0xaf22): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `stmpe_exit':
> stmpe-i2c.c:(.exit.text+0x5e5): undefined reference to `i2c_del_driver'
> 
> Caused by commit b25a31a3b4d3 ("mfd: Separate out STMPE controller and
> interface specific code").
> 
> I have used the mfd tree from next-20111219 for today.
Thanks for the notification. This should be all fixed now, you can use the
latest MFD tree.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2011-12-20  3:17 Stephen Rothwell
  2011-12-20 17:37 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2011-12-20  3:17 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Viresh Kumar

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/built-in.o: In function `i2c_block_write':
stmpe-i2c.c:(.text+0xf4553): undefined reference to `i2c_smbus_write_i2c_block_data'
drivers/built-in.o: In function `i2c_block_read':
stmpe-i2c.c:(.text+0xf457f): undefined reference to `i2c_smbus_read_i2c_block_data'
drivers/built-in.o: In function `i2c_reg_write':
stmpe-i2c.c:(.text+0xf45ab): undefined reference to `i2c_smbus_write_byte_data'
drivers/built-in.o: In function `i2c_reg_read':
stmpe-i2c.c:(.text+0xf45d4): undefined reference to `i2c_smbus_read_byte_data'
drivers/built-in.o: In function `stmpe_init':
stmpe-i2c.c:(.init.text+0xaf22): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `stmpe_exit':
stmpe-i2c.c:(.exit.text+0x5e5): undefined reference to `i2c_del_driver'

Caused by commit b25a31a3b4d3 ("mfd: Separate out STMPE controller and
interface specific code").

I have used the mfd tree from next-20111219 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-09-19  6:19 Stephen Rothwell
@ 2011-09-19  9:43 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2011-09-19  9:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, "Uwe Kleine-König"

Hi Stephen,

On Mon, Sep 19, 2011 at 04:19:00PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
Sorry. I pushed a fix for this. allmodconfig should be clean now.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2011-09-19  6:19 Stephen Rothwell
  2011-09-19  9:43 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2011-09-19  6:19 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, "Uwe Kleine-König"

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/regulator/mc13783-regulator.c: In function 'mc13783_regulator_probe':
drivers/regulator/mc13783-regulator.c:347:9: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:355:23: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:356:21: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:358:34: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:359:26: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c: In function 'mc13783_regulator_remove':
drivers/regulator/mc13783-regulator.c:390:23: error: dereferencing pointer to incomplete type

Caused by commit a7e5c9a30148 ("mfd: Remove mc13783 API functions and
symbols").

I have used the mfd tree from next-20110915 again today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-09-16  3:55 Stephen Rothwell
  2011-09-16  7:16 ` Uwe Kleine-König
@ 2011-09-18 17:15 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2011-09-18 17:15 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, David Jander, Uwe Kleine-König

Hi Stephen,

On Fri, Sep 16, 2011 at 01:55:23PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
> drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
>

This should be fixed now, thanks for the report.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-09-16  7:16 ` Uwe Kleine-König
@ 2011-09-16  8:39   ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2011-09-16  8:39 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: Samuel Ortiz, linux-next, linux-kernel, David Jander

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

Hi Uwe,

On Fri, 16 Sep 2011 09:16:38 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> > Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
> > to mc13xxx MFD").
> > 
> > I have used the mfd tree from next-20110915 for today.
> I'd look into the issue, but I don't have 747c98a3660d and I don't know
> where to get it from. IMHO it would be great if you could push your next
> tree somewhere.

Well, you can get it from the mfd tree (branch for-next of
git://git.infradead.org/users/sameo/mfd-2.6.git).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-09-16  3:55 Stephen Rothwell
@ 2011-09-16  7:16 ` Uwe Kleine-König
  2011-09-16  8:39   ` Stephen Rothwell
  2011-09-18 17:15 ` Samuel Ortiz
  1 sibling, 1 reply; 127+ messages in thread
From: Uwe Kleine-König @ 2011-09-16  7:16 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel, David Jander

Hello Stephen,

On Fri, Sep 16, 2011 at 01:55:23PM +1000, Stephen Rothwell wrote:
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
> drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:196:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:203:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:206:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:213:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:216:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:223:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:226:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:233:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:236:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:244:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:246:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:248:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:250:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:253:15: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:255:15: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c: In function 'mc13783_led_probe':
> drivers/leds/leds-mc13783.c:278:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:278:34: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:279:54: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:283:36: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:295:23: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:297:19: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:299:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:299:47: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:300:50: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:305:31: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:307:13: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:312:27: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:313:31: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:314:42: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:317:24: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:329:43: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c: In function 'mc13783_led_remove':
> drivers/leds/leds-mc13783.c:359:23: error: dereferencing pointer to incomplete type
> 
> Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
> to mc13xxx MFD").
> 
> I have used the mfd tree from next-20110915 for today.
I'd look into the issue, but I don't have 747c98a3660d and I don't know
where to get it from. IMHO it would be great if you could push your next
tree somewhere.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2011-09-16  3:55 Stephen Rothwell
  2011-09-16  7:16 ` Uwe Kleine-König
  2011-09-18 17:15 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2011-09-16  3:55 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: linux-next, linux-kernel, David Jander, Uwe Kleine-König

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:196:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:203:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:206:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:213:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:216:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:223:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:226:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:233:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:236:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:244:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:246:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:248:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:250:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:253:15: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:255:15: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c: In function 'mc13783_led_probe':
drivers/leds/leds-mc13783.c:278:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:278:34: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:279:54: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:283:36: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:295:23: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:297:19: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:299:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:299:47: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:300:50: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:305:31: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:307:13: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:312:27: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:313:31: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:314:42: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:317:24: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:329:43: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c: In function 'mc13783_led_remove':
drivers/leds/leds-mc13783.c:359:23: error: dereferencing pointer to incomplete type

Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
to mc13xxx MFD").

I have used the mfd tree from next-20110915 for today.

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

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-06-21  3:03 Stephen Rothwell
  2011-06-21 10:07 ` Mark Brown
@ 2011-06-21 17:58 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2011-06-21 17:58 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown

Hi Stephen,

On Tue, Jun 21, 2011 at 01:03:31PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/wm831x-core.c: In function 'wm831x_device_init':
> drivers/mfd/wm831x-core.c:1507:12: error: 'WM831X_XTAL_ENA' undeclared (first use in this function)
> 
> Caused by commit e1af6eaa2160 ("mfd: Only register wm831x RTC device if
> the 32.768kHz crystal is enabled").
Thanks for the heads up. That should be all fixed now.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-06-21  3:03 Stephen Rothwell
@ 2011-06-21 10:07 ` Mark Brown
  2011-06-21 17:58 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Mark Brown @ 2011-06-21 10:07 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

On Tue, Jun 21, 2011 at 01:03:31PM +1000, Stephen Rothwell wrote:

> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:

> drivers/mfd/wm831x-core.c: In function 'wm831x_device_init':
> drivers/mfd/wm831x-core.c:1507:12: error: 'WM831X_XTAL_ENA' undeclared (first use in this function)

> Caused by commit e1af6eaa2160 ("mfd: Only register wm831x RTC device if
> the 32.768kHz crystal is enabled").

I sent a patch adding this at the time the patch was originally added -
I'll resend it shortly.

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2011-06-21  3:03 Stephen Rothwell
  2011-06-21 10:07 ` Mark Brown
  2011-06-21 17:58 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2011-06-21  3:03 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mark Brown

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/wm831x-core.c: In function 'wm831x_device_init':
drivers/mfd/wm831x-core.c:1507:12: error: 'WM831X_XTAL_ENA' undeclared (first use in this function)

Caused by commit e1af6eaa2160 ("mfd: Only register wm831x RTC device if
the 32.768kHz crystal is enabled").

I have used the mfd tree from next-20110620 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2011-02-22  3:20 Stephen Rothwell
@ 2011-02-22  9:21 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2011-02-22  9:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Arun Murthy

Hi Stephen,

On Tue, Feb 22, 2011 at 02:20:05PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/ab8500-gpadc.c:20:36: error: linux/mfd/ab8500-gpadc.h: No such file or directory
> 
> Caused by commit 38a7f5349d3820b3603384733cd2f35913f923ea ("mfd: Add new
> ab8500 GPADC driver"). Looks like an include file was forgotten.
That's my fault, I had to manually merge this one and forgot to git add the
header file.
It should be all fixed now, thanks for the notification.

Cheers,
Samuel.

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2011-02-22  3:20 Stephen Rothwell
  2011-02-22  9:21 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2011-02-22  3:20 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Arun Murthy

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/ab8500-gpadc.c:20:36: error: linux/mfd/ab8500-gpadc.h: No such file or directory

Caused by commit 38a7f5349d3820b3603384733cd2f35913f923ea ("mfd: Add new
ab8500 GPADC driver"). Looks like an include file was forgotten.

I have used the mfd tree form next-20110221 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-09-16  2:54 Stephen Rothwell
@ 2010-09-19 22:27 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2010-09-19 22:27 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Gary King

Hi Stephen,

On Thu, Sep 16, 2010 at 12:54:47PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/built-in.o: In function `__tps6586x_read':
> tps6586x.c:(.text+0xe4151): undefined reference to `i2c_smbus_read_byte_data'
> drivers/built-in.o: In function `__tps6586x_write':
> tps6586x.c:(.text+0xe4345): undefined reference to `i2c_smbus_write_byte_data'
> drivers/built-in.o: In function `tps6586x_reads':
> (.text+0xe4762): undefined reference to `i2c_smbus_read_i2c_block_data'
> drivers/built-in.o: In function `tps6586x_writes':
> (.text+0xe4894): undefined reference to `i2c_smbus_write_i2c_block_data'
> drivers/built-in.o: In function `tps6586x_init':
> tps6586x.c:(.init.text+0xc511): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `tps6586x_i2c_probe':
> tps6586x.c:(.devinit.text+0x4ae6): undefined reference to `i2c_smbus_read_byte_data'
> drivers/built-in.o: In function `tps6586x_exit':
> tps6586x.c:(.exit.text+0x574): undefined reference to `i2c_del_driver'
> 
> Caused by commit 2d0a9a6d922712267ef62a5e8b38ed2b37cf45cc ("mfd: Add
> basic tps6586x interrupt support").  Presumably a missing dependency.
> 
> I have used the mfd tree from next-20100915 for today.
Sorry about that, this is fixed now.

Cheers,
Samuel.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/



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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-09-16  2:54 Stephen Rothwell
  2010-09-19 22:27 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2010-09-16  2:54 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Gary King

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/built-in.o: In function `__tps6586x_read':
tps6586x.c:(.text+0xe4151): undefined reference to `i2c_smbus_read_byte_data'
drivers/built-in.o: In function `__tps6586x_write':
tps6586x.c:(.text+0xe4345): undefined reference to `i2c_smbus_write_byte_data'
drivers/built-in.o: In function `tps6586x_reads':
(.text+0xe4762): undefined reference to `i2c_smbus_read_i2c_block_data'
drivers/built-in.o: In function `tps6586x_writes':
(.text+0xe4894): undefined reference to `i2c_smbus_write_i2c_block_data'
drivers/built-in.o: In function `tps6586x_init':
tps6586x.c:(.init.text+0xc511): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `tps6586x_i2c_probe':
tps6586x.c:(.devinit.text+0x4ae6): undefined reference to `i2c_smbus_read_byte_data'
drivers/built-in.o: In function `tps6586x_exit':
tps6586x.c:(.exit.text+0x574): undefined reference to `i2c_del_driver'

Caused by commit 2d0a9a6d922712267ef62a5e8b38ed2b37cf45cc ("mfd: Add
basic tps6586x interrupt support").  Presumably a missing dependency.

I have used the mfd tree from next-20100915 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-08-09  1:40 Stephen Rothwell
  2010-08-09  8:51 ` Mike Rapoport
@ 2010-08-09  9:10 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2010-08-09  9:10 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mike Rapoport

Hi Stephen,

On Mon, Aug 09, 2010 at 11:40:42AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/tps6586x.c: In function 'tps6586x_add_subdevs':
> drivers/mfd/tps6586x.c:272: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:273: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:278: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c: In function 'tps6586x_i2c_probe':
> drivers/mfd/tps6586x.c:324: warning: passing argument 2 of 'tps6586x_add_subdevs' from incompatible pointer type
> drivers/mfd/tps6586x.c:265: note: expected 'struct tps6586x_platform_data *' but argument is of type 'struct tps6586x_platform_data *'
> drivers/mfd/tps6586x.c:330: error: dereferencing pointer to incomplete type
> 
> Caused by commit 8232c2794cf0e39b38d089eff49500461ecdbb8f ("mfd: Add
> TPS6586x driver").  "struct tps6586x_platform_data" is not defined
> anywhere ...
Sorry about that, it should be all fixed now.

Cheers,
Samuel.


> I have used the mfd tree from next-20100807 for today.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/



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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-08-09  1:40 Stephen Rothwell
@ 2010-08-09  8:51 ` Mike Rapoport
  2010-08-09  9:10 ` Samuel Ortiz
  1 sibling, 0 replies; 127+ messages in thread
From: Mike Rapoport @ 2010-08-09  8:51 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel, Mike Rapoport

Hi Samuel,

Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/tps6586x.c: In function 'tps6586x_add_subdevs':
> drivers/mfd/tps6586x.c:272: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:273: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c:278: error: dereferencing pointer to incomplete type
> drivers/mfd/tps6586x.c: In function 'tps6586x_i2c_probe':
> drivers/mfd/tps6586x.c:324: warning: passing argument 2 of 'tps6586x_add_subdevs' from incompatible pointer type
> drivers/mfd/tps6586x.c:265: note: expected 'struct tps6586x_platform_data *' but argument is of type 'struct tps6586x_platform_data *'
> drivers/mfd/tps6586x.c:330: error: dereferencing pointer to incomplete type
> 
> Caused by commit 8232c2794cf0e39b38d089eff49500461ecdbb8f ("mfd: Add
> TPS6586x driver").  "struct tps6586x_platform_data" is not defined
> anywhere ...

It seems to me that the include/linux/mfd/tps6586x.h was omitted from your 
commit to the mfd tree. Can you please check?

> I have used the mfd tree from next-20100807 for today.


-- 
Sincerely yours,
Mike.

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-08-09  1:40 Stephen Rothwell
  2010-08-09  8:51 ` Mike Rapoport
  2010-08-09  9:10 ` Samuel Ortiz
  0 siblings, 2 replies; 127+ messages in thread
From: Stephen Rothwell @ 2010-08-09  1:40 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mike Rapoport

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/tps6586x.c: In function 'tps6586x_add_subdevs':
drivers/mfd/tps6586x.c:272: error: dereferencing pointer to incomplete type
drivers/mfd/tps6586x.c:273: error: dereferencing pointer to incomplete type
drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
drivers/mfd/tps6586x.c:275: error: dereferencing pointer to incomplete type
drivers/mfd/tps6586x.c:278: error: dereferencing pointer to incomplete type
drivers/mfd/tps6586x.c: In function 'tps6586x_i2c_probe':
drivers/mfd/tps6586x.c:324: warning: passing argument 2 of 'tps6586x_add_subdevs' from incompatible pointer type
drivers/mfd/tps6586x.c:265: note: expected 'struct tps6586x_platform_data *' but argument is of type 'struct tps6586x_platform_data *'
drivers/mfd/tps6586x.c:330: error: dereferencing pointer to incomplete type

Caused by commit 8232c2794cf0e39b38d089eff49500461ecdbb8f ("mfd: Add
TPS6586x driver").  "struct tps6586x_platform_data" is not defined
anywhere ...

I have used the mfd tree from next-20100807 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-05-19  9:57   ` Samuel Ortiz
@ 2010-05-19 14:14     ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2010-05-19 14:14 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: Rabin VINCENT, linux-next, linux-kernel

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

Hi Samuel, Rabin,

On Wed, 19 May 2010 11:57:20 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> Patch merged with the main ab8500 one, thanks for the quick fix.
> Stephen, this is pushed and the mfd tree should be fine now.

Thanks guys.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-05-19  4:23 ` Rabin VINCENT
@ 2010-05-19  9:57   ` Samuel Ortiz
  2010-05-19 14:14     ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2010-05-19  9:57 UTC (permalink / raw)
  To: Rabin VINCENT; +Cc: Stephen Rothwell, linux-next, linux-kernel

Hi Rabin,

On Wed, May 19, 2010 at 09:53:35AM +0530, Rabin VINCENT wrote:
> On Wed, May 19, 2010 at 06:03:10 +0200, Stephen Rothwell wrote:
> > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove':
> > drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags'
> > 
> > Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new
> > AB8500 driver").
> 
> Oops, one of the calls to set_irq_flags() is missing a CONFIG_ARM.  The
> patch below should fix it.  Thanks.
Patch merged with the main ab8500 one, thanks for the quick fix.
Stephen, this is pushed and the mfd tree should be fine now.

Cheers,
Samuel.


> From 39368228513c8b429daa274362e7bfe80598b366 Mon Sep 17 00:00:00 2001
> From: Rabin Vincent <rabin.vincent@stericsson.com>
> Date: Wed, 19 May 2010 09:41:56 +0530
> Subject: [PATCH] mfd: ab8500: fix build on !ARM
> 
> Add a missing CONFIG_ARM around one of the calls to set_irq_flags(), to
> prevent these errors on other archs:
> 
> drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove':
> drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags'
> 
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
> ---
>  drivers/mfd/ab8500-core.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
> index e93833f..f3d26fa 100644
> --- a/drivers/mfd/ab8500-core.c
> +++ b/drivers/mfd/ab8500-core.c
> @@ -299,7 +299,9 @@ static void ab8500_irq_remove(struct ab8500 *ab8500)
>  	int irq;
>  
>  	for (irq = base; irq < base + AB8500_NR_IRQS; irq++) {
> +#ifdef CONFIG_ARM
>  		set_irq_flags(irq, 0);
> +#endif
>  		set_irq_chip_and_handler(irq, NULL, NULL);
>  		set_irq_chip_data(irq, NULL);
>  	}
> -- 
> 1.7.0
> 

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-05-19  4:03 Stephen Rothwell
@ 2010-05-19  4:23 ` Rabin VINCENT
  2010-05-19  9:57   ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Rabin VINCENT @ 2010-05-19  4:23 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel

On Wed, May 19, 2010 at 06:03:10 +0200, Stephen Rothwell wrote:
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove':
> drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags'
> 
> Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new
> AB8500 driver").

Oops, one of the calls to set_irq_flags() is missing a CONFIG_ARM.  The
patch below should fix it.  Thanks.

>From 39368228513c8b429daa274362e7bfe80598b366 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Wed, 19 May 2010 09:41:56 +0530
Subject: [PATCH] mfd: ab8500: fix build on !ARM

Add a missing CONFIG_ARM around one of the calls to set_irq_flags(), to
prevent these errors on other archs:

drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove':
drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags'

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
---
 drivers/mfd/ab8500-core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index e93833f..f3d26fa 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -299,7 +299,9 @@ static void ab8500_irq_remove(struct ab8500 *ab8500)
 	int irq;
 
 	for (irq = base; irq < base + AB8500_NR_IRQS; irq++) {
+#ifdef CONFIG_ARM
 		set_irq_flags(irq, 0);
+#endif
 		set_irq_chip_and_handler(irq, NULL, NULL);
 		set_irq_chip_data(irq, NULL);
 	}
-- 
1.7.0

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-05-19  4:03 Stephen Rothwell
  2010-05-19  4:23 ` Rabin VINCENT
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2010-05-19  4:03 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Rabin Vincent

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove':
drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags'

Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new
AB8500 driver").

I have used the mfd tree from next-20100518 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-04-08  2:57 Stephen Rothwell
@ 2010-04-08  9:33 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2010-04-08  9:33 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Todd Fischer

Hi Stephen,

On Thu, Apr 08, 2010 at 12:57:21PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/tps6507x.c: In function 'tps6507x_i2c_probe':
> drivers/mfd/tps6507x.c:90: error: implicit declaration of function 'kzalloc'
> drivers/mfd/tps6507x.c:90: warning: assignment makes pointer from integer without a cast
> drivers/mfd/tps6507x.c:92: error: implicit declaration of function 'kfree'
> 
> Caused by commit 353dd1bf937f319eb6fdf35a461bf0bea1361d23 ("mfd: Add
> TPS6507x support").
Fixed in my for-next branch, thanks for the report.

Cheers,
Samuel.

 
> I applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Apr 2010 12:53:32 +1000
> Subject: [PATCH] mfd: TPS6507x: using kzalloc/kfree requires including slab.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/mfd/tps6507x.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
> index dcddef0..d859dff 100644
> --- a/drivers/mfd/tps6507x.c
> +++ b/drivers/mfd/tps6507x.c
> @@ -17,6 +17,7 @@
>  #include <linux/module.h>
>  #include <linux/moduleparam.h>
>  #include <linux/init.h>
> +#include <linux/slab.h>
>  #include <linux/i2c.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/tps6507x.h>
> -- 
> 1.7.0.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-04-08  2:57 Stephen Rothwell
  2010-04-08  9:33 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2010-04-08  2:57 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Todd Fischer

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/tps6507x.c: In function 'tps6507x_i2c_probe':
drivers/mfd/tps6507x.c:90: error: implicit declaration of function 'kzalloc'
drivers/mfd/tps6507x.c:90: warning: assignment makes pointer from integer without a cast
drivers/mfd/tps6507x.c:92: error: implicit declaration of function 'kfree'

Caused by commit 353dd1bf937f319eb6fdf35a461bf0bea1361d23 ("mfd: Add
TPS6507x support").

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Apr 2010 12:53:32 +1000
Subject: [PATCH] mfd: TPS6507x: using kzalloc/kfree requires including slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mfd/tps6507x.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index dcddef0..d859dff 100644
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps6507x.h>
-- 
1.7.0.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply related	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-04-07  8:53 ` Samuel Ortiz
@ 2010-04-07 16:24   ` Stephen Rothwell
  0 siblings, 0 replies; 127+ messages in thread
From: Stephen Rothwell @ 2010-04-07 16:24 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Ira W. Snyder

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

Hi Samuel,

On Wed, 7 Apr 2010 10:53:02 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> I fixed and verified this one as well, thanks a lot.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-04-07  5:02 Stephen Rothwell
@ 2010-04-07  8:53 ` Samuel Ortiz
  2010-04-07 16:24   ` Stephen Rothwell
  0 siblings, 1 reply; 127+ messages in thread
From: Samuel Ortiz @ 2010-04-07  8:53 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Ira W. Snyder

Hi Stephen,

On Wed, Apr 07, 2010 at 03:02:42PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mfd/janz-cmodio.c:270: error: 'PCI_VENDOR_ID_JANZ' undeclared here (not in a function)
> 
> Caused by commit d4a16922bc8ecece287becf3cc2c0333f77bdf9e ("mfd: Janz
> CMOD-IO PCI MODULbus Carrier Board support").
> 
> I have used the version of the mfd tree from next-20100401 for today.
I fixed and verified this one as well, thanks a lot.

Cheers,
Samuel.


> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/



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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* Re: linux-next: build failure after merge of the mfd tree
  2010-04-07  4:51 Stephen Rothwell
@ 2010-04-07  8:52 ` Samuel Ortiz
  0 siblings, 0 replies; 127+ messages in thread
From: Samuel Ortiz @ 2010-04-07  8:52 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo, Ira W. Snyder

Hi Stephen,

On Wed, Apr 07, 2010 at 02:51:13PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/gpio/janz-ttl.c: In function 'ttl_probe':
> drivers/gpio/janz-ttl.c:158: error: implicit declaration of function 'kzalloc'
> drivers/gpio/janz-ttl.c:158: warning: assignment makes pointer from integer without a cast
> drivers/gpio/janz-ttl.c:210: error: implicit declaration of function 'kfree'
> 
> Caused by commit 989b68d7d885a45099126e32b46304afd9b3789e ("gpio: Add
> support for Janz VMOD-TTL Digital IO module") interacting with commit
> de380b55f92986c1a84198149cb71b7228d15fbd ("percpu: don't implicitly
> include slab.h from percpu.h").
Sorry about that. That's fixed with the latest mfd tree.

Cheers,
Samuel.


> I applied the following fix patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 7 Apr 2010 14:47:52 +1000
> Subject: [PATCH] gpio: janz-ttl: using kzalloc/kfree requires including slab.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpio/janz-ttl.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
> index d97eeda..813ac07 100644
> --- a/drivers/gpio/janz-ttl.c
> +++ b/drivers/gpio/janz-ttl.c
> @@ -17,6 +17,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/io.h>
>  #include <linux/gpio.h>
> +#include <linux/slab.h>
>  
>  #include <linux/mfd/janz.h>
>  
> -- 
> 1.7.0.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-04-07  5:02 Stephen Rothwell
  2010-04-07  8:53 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2010-04-07  5:02 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Ira W. Snyder

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

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mfd/janz-cmodio.c:270: error: 'PCI_VENDOR_ID_JANZ' undeclared here (not in a function)

Caused by commit d4a16922bc8ecece287becf3cc2c0333f77bdf9e ("mfd: Janz
CMOD-IO PCI MODULbus Carrier Board support").

I have used the version of the mfd tree from next-20100401 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 127+ messages in thread

* linux-next: build failure after merge of the mfd tree
@ 2010-04-07  4:51 Stephen Rothwell
  2010-04-07  8:52 ` Samuel Ortiz
  0 siblings, 1 reply; 127+ messages in thread
From: Stephen Rothwell @ 2010-04-07  4:51 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Tejun Heo, Ira W. Snyder

Hi Samuel,

After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpio/janz-ttl.c: In function 'ttl_probe':
drivers/gpio/janz-ttl.c:158: error: implicit declaration of function 'kzalloc'
drivers/gpio/janz-ttl.c:158: warning: assignment makes pointer from integer without a cast
drivers/gpio/janz-ttl.c:210: error: implicit declaration of function 'kfree'

Caused by commit 989b68d7d885a45099126e32b46304afd9b3789e ("gpio: Add
support for Janz VMOD-TTL Digital IO module") interacting with commit
de380b55f92986c1a84198149cb71b7228d15fbd ("percpu: don't implicitly
include slab.h from percpu.h").

I applied the following fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Apr 2010 14:47:52 +1000
Subject: [PATCH] gpio: janz-ttl: using kzalloc/kfree requires including slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpio/janz-ttl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
index d97eeda..813ac07 100644
--- a/drivers/gpio/janz-ttl.c
+++ b/drivers/gpio/janz-ttl.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/slab.h>
 
 #include <linux/mfd/janz.h>
 
-- 
1.7.0.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply related	[flat|nested] 127+ messages in thread

end of thread, other threads:[~2023-04-06 17:23 UTC | newest]

Thread overview: 127+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-04  6:44 linux-next: build failure after merge of the mfd tree Stephen Rothwell
2017-04-04  8:19 ` Lee Jones
2017-04-04  8:21   ` Lee Jones
2017-04-04 12:31     ` Andy Shevchenko
2017-04-10  2:11       ` Stephen Rothwell
2017-04-10  6:55         ` Lee Jones
2017-04-10  7:53           ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-04-06  2:00 Stephen Rothwell
2023-04-06  7:36 ` Lee Jones
2023-04-06 17:22   ` Mark Brown
2023-03-31  1:15 Stephen Rothwell
2022-07-05  1:54 Stephen Rothwell
2022-07-05 12:32 ` Lee Jones
2022-07-05 14:26   ` Aidan MacDonald
2022-02-23 16:54 broonie
2022-02-23 17:03 ` Lee Jones
2022-02-28  6:08   ` Stephen Rothwell
2022-02-28  8:17     ` Lee Jones
     [not found] <20201105014728.GC17266@qmqm.qmqm.pl>
2020-11-05  1:50 ` Stephen Rothwell
2020-11-05  1:57   ` Michał Mirosław
2020-11-05  9:09     ` Lee Jones
2020-07-17  3:41 Stephen Rothwell
2020-07-17  6:56 ` Lee Jones
2020-07-17  6:59   ` Stephen Rothwell
2020-07-17  7:11     ` Lee Jones
2020-02-04  3:03 Stephen Rothwell
2020-02-04  7:53 ` Lee Jones
2020-02-04 10:04   ` Srinivas Kandagatla
2019-04-03  0:40 Stephen Rothwell
2018-12-17  5:38 Stephen Rothwell
2017-12-04  3:19 Stephen Rothwell
2017-12-04  9:10 ` Greg KH
2017-12-04  9:39 ` Lee Jones
2017-12-05 23:32   ` Stephen Rothwell
2017-12-06  8:58     ` Lee Jones
2017-12-12  2:13       ` Stephen Rothwell
2017-12-12  8:13         ` Lee Jones
2017-12-12 11:54           ` Stephen Rothwell
2017-05-31  2:23 Stephen Rothwell
2017-05-31  3:36 ` Stephen Rothwell
2017-06-05  3:28 ` Stephen Rothwell
2016-02-29  3:51 Stephen Rothwell
2016-03-01  1:19 ` Kuninori Morimoto
2016-03-01  1:35   ` Kuninori Morimoto
2016-03-02  4:00     ` Mark Brown
2015-10-15  2:26 Stephen Rothwell
2015-10-15  3:35 ` kbuild test robot
2015-10-15  8:59 ` Arnd Bergmann
2015-10-15  9:17   ` Lee Jones
2015-10-15  9:45   ` Andy Shevchenko
2015-10-15 12:04   ` Christoph Hellwig
2015-10-15 12:28     ` Arnd Bergmann
2015-10-16  1:27       ` Stephen Rothwell
2015-10-16 10:10         ` Arnd Bergmann
2015-03-04  0:34 Stephen Rothwell
2015-03-04  0:37 ` Stephen Rothwell
2015-03-04  7:26 ` Sascha Hauer
2014-11-11  2:32 Stephen Rothwell
2014-11-04  5:40 Stephen Rothwell
2014-11-04  7:54 ` Krzysztof Kozlowski
2014-11-04  8:09   ` Lee Jones
2014-08-22 16:56 Stephen Rothwell
2014-08-22 19:09 ` Lee Jones
2013-04-08  4:21 Stephen Rothwell
2013-04-08  4:45 ` Alexander Shiyan
2013-04-08  9:22   ` Samuel Ortiz
2013-04-08 16:27     ` Re[2]: " Alexander Shiyan
2013-04-09  7:20       ` Samuel Ortiz
2013-04-09 15:47         ` Re[2]: " Alexander Shiyan
2013-04-09 16:12           ` Samuel Ortiz
2013-04-09 16:50             ` Rob Herring
2013-04-09 20:51               ` Samuel Ortiz
2012-09-25  3:47 Stephen Rothwell
2012-09-25  6:47 ` Matthias Kaehlcke
2012-09-25  8:43 ` Samuel Ortiz
2012-07-09  3:57 Stephen Rothwell
2012-07-09 10:52 ` Samuel Ortiz
2012-07-10  9:20 ` Samuel Ortiz
2012-05-21  3:42 Stephen Rothwell
2012-05-21  8:08 ` Lee Jones
2012-05-21  8:40   ` Stephen Rothwell
2012-05-21  9:01     ` Lee Jones
2012-05-21  9:10       ` Stephen Rothwell
2012-05-21  9:19         ` Lee Jones
2012-05-21  9:54           ` Mark Brown
2012-05-21 10:28             ` Lee Jones
2012-05-22 22:42               ` Samuel Ortiz
2012-05-22 22:52                 ` Stephen Rothwell
2012-05-23 14:34                   ` Samuel Ortiz
2012-05-21  8:30 ` Lee Jones
2012-05-21  9:07   ` Stephen Rothwell
2012-05-16  6:09 Stephen Rothwell
2012-05-18  8:39 ` Samuel Ortiz
2012-05-14  3:37 Stephen Rothwell
2012-05-14 20:22 ` Samuel Ortiz
2012-03-19  2:13 Stephen Rothwell
2012-03-19  6:19 ` Laxman Dewangan
2012-03-20 12:40 ` Samuel Ortiz
2012-02-21  1:31 Stephen Rothwell
2012-02-21 11:32 ` Samuel Ortiz
2011-12-20  3:17 Stephen Rothwell
2011-12-20 17:37 ` Samuel Ortiz
2011-09-19  6:19 Stephen Rothwell
2011-09-19  9:43 ` Samuel Ortiz
2011-09-16  3:55 Stephen Rothwell
2011-09-16  7:16 ` Uwe Kleine-König
2011-09-16  8:39   ` Stephen Rothwell
2011-09-18 17:15 ` Samuel Ortiz
2011-06-21  3:03 Stephen Rothwell
2011-06-21 10:07 ` Mark Brown
2011-06-21 17:58 ` Samuel Ortiz
2011-02-22  3:20 Stephen Rothwell
2011-02-22  9:21 ` Samuel Ortiz
2010-09-16  2:54 Stephen Rothwell
2010-09-19 22:27 ` Samuel Ortiz
2010-08-09  1:40 Stephen Rothwell
2010-08-09  8:51 ` Mike Rapoport
2010-08-09  9:10 ` Samuel Ortiz
2010-05-19  4:03 Stephen Rothwell
2010-05-19  4:23 ` Rabin VINCENT
2010-05-19  9:57   ` Samuel Ortiz
2010-05-19 14:14     ` Stephen Rothwell
2010-04-08  2:57 Stephen Rothwell
2010-04-08  9:33 ` Samuel Ortiz
2010-04-07  5:02 Stephen Rothwell
2010-04-07  8:53 ` Samuel Ortiz
2010-04-07 16:24   ` Stephen Rothwell
2010-04-07  4:51 Stephen Rothwell
2010-04-07  8:52 ` Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).