diff options
| author | Johannes Thumshirn <johannes.thumshirn@men.de> | 2013-10-23 13:31:00 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 17:22:40 +0200 |
| commit | 6bfd1e63de34a278d67db32e3644340838308252 (patch) | |
| tree | 1167fa2a59583b98ed909045975b76ba79fad75f | |
| parent | mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock (diff) | |
| download | linux-6bfd1e63de34a278d67db32e3644340838308252.tar.xz linux-6bfd1e63de34a278d67db32e3644340838308252.zip | |
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 <andreas.werner@men.de>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@men.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/lpc_sch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c index 8cc6aac27cb2..fbfbf0b7f97a 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) = { |