2013-10-23 11:31:19

by Johannes Thumshirn

[permalink] [raw]
Subject: [PATCH] mfd: lpc_sch: Ignore resource conflicts when adding mfd cells

Currently probe of lpc_sch fails on Intel Poulsbo because of ACPI resource
conflicts. A solution is to set the ignore_resource_conflicts flag in the mfd cells.

Tested-by: Andreas Werner <[email protected]>
Signed-off-by: Johannes Thumshirn <[email protected]>
---
drivers/mfd/lpc_sch.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index 8cc6aac..fbfbf0b 100644
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/lpc_sch.c
@@ -59,18 +59,21 @@ static struct mfd_cell isch_smbus_cell = {
.name = "isch_smbus",
.num_resources = 1,
.resources = &smbus_sch_resource,
+ .ignore_resource_conflicts = true,
};

static struct mfd_cell sch_gpio_cell = {
.name = "sch_gpio",
.num_resources = 1,
.resources = &gpio_sch_resource,
+ .ignore_resource_conflicts = true,
};

static struct mfd_cell wdt_sch_cell = {
.name = "ie6xx_wdt",
.num_resources = 1,
.resources = &wdt_sch_resource,
+ .ignore_resource_conflicts = true,
};

static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {
--
1.7.9.5


2013-10-23 13:05:33

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH] mfd: lpc_sch: Ignore resource conflicts when adding mfd cells

On Wed, 23 Oct 2013, Johannes Thumshirn wrote:

> Currently probe of lpc_sch fails on Intel Poulsbo because of ACPI resource
> conflicts. A solution is to set the ignore_resource_conflicts flag in the mfd cells.
>
> Tested-by: Andreas Werner <[email protected]>
> Signed-off-by: Johannes Thumshirn <[email protected]>
> ---
> drivers/mfd/lpc_sch.c | 3 +++
> 1 file changed, 3 insertions(+)

I'm okay with this change. I'll apply it until someone else complains.

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

2013-10-23 13:15:30

by Johannes Thumshirn

[permalink] [raw]
Subject: Re: [PATCH] mfd: lpc_sch: Ignore resource conflicts when adding mfd cells

On Wed, Oct 23, 2013 at 02:05:27PM +0100, Lee Jones wrote:
> On Wed, 23 Oct 2013, Johannes Thumshirn wrote:
>
> > Currently probe of lpc_sch fails on Intel Poulsbo because of ACPI resource
> > conflicts. A solution is to set the ignore_resource_conflicts flag in the mfd cells.
> >
> > Tested-by: Andreas Werner <[email protected]>
> > Signed-off-by: Johannes Thumshirn <[email protected]>
> > ---
> > drivers/mfd/lpc_sch.c | 3 +++
> > 1 file changed, 3 insertions(+)
>
> I'm okay with this change. I'll apply it until someone else complains.
>
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

Wow, that was fast.

Johannes