diff options
author | Johannes Thumshirn <johannes.thumshirn@men.de> | 2013-10-23 07:31:00 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 11:22:40 -0400 |
commit | 6bfd1e63de34a278d67db32e3644340838308252 (patch) | |
tree | 1167fa2a59583b98ed909045975b76ba79fad75f | |
parent | 317b2099938fe6f27e51c4b58e76f4de8212d3e6 (diff) |
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 = { | |||
59 | .name = "isch_smbus", | 59 | .name = "isch_smbus", |
60 | .num_resources = 1, | 60 | .num_resources = 1, |
61 | .resources = &smbus_sch_resource, | 61 | .resources = &smbus_sch_resource, |
62 | .ignore_resource_conflicts = true, | ||
62 | }; | 63 | }; |
63 | 64 | ||
64 | static struct mfd_cell sch_gpio_cell = { | 65 | static struct mfd_cell sch_gpio_cell = { |
65 | .name = "sch_gpio", | 66 | .name = "sch_gpio", |
66 | .num_resources = 1, | 67 | .num_resources = 1, |
67 | .resources = &gpio_sch_resource, | 68 | .resources = &gpio_sch_resource, |
69 | .ignore_resource_conflicts = true, | ||
68 | }; | 70 | }; |
69 | 71 | ||
70 | static struct mfd_cell wdt_sch_cell = { | 72 | static struct mfd_cell wdt_sch_cell = { |
71 | .name = "ie6xx_wdt", | 73 | .name = "ie6xx_wdt", |
72 | .num_resources = 1, | 74 | .num_resources = 1, |
73 | .resources = &wdt_sch_resource, | 75 | .resources = &wdt_sch_resource, |
76 | .ignore_resource_conflicts = true, | ||
74 | }; | 77 | }; |
75 | 78 | ||
76 | static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { | 79 | static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { |