mfd: intel_quark_i2c_gpio: support devices behind i2c bus

On Intel Galileo Gen2 the GPIO expanders are connected to the i2c bus. For
those devices the ACPI table has specific parameters that refer to an actual
i2c host controller. Since MFD now copes with that specific configuration we
have to provide a necessary information how to distinguish devices in ACPI
namespace. Here the _ADR values are provided.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index 958c13473e8c204935d0def9f027dac635cba471..04213746530035af262a77bb7dd03e595e29c8c2 100644 (file)
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -31,6 +31,10 @@
 #define MFD_I2C_BAR            0
 #define MFD_GPIO_BAR           1
 
+/* ACPI _ADR value to match the child node */
+#define MFD_ACPI_MATCH_GPIO    0ULL
+#define MFD_ACPI_MATCH_I2C     1ULL
+
 /* The base GPIO number under GPIOLIB framework */
 #define INTEL_QUARK_MFD_GPIO_BASE      8
 
@@ -82,16 +86,25 @@ static struct resource intel_quark_i2c_res[] = {
        },
 };
 
+static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = {
+       .adr = MFD_ACPI_MATCH_I2C,
+};
+
 static struct resource intel_quark_gpio_res[] = {
        [INTEL_QUARK_IORES_MEM] = {
                .flags = IORESOURCE_MEM,
        },
 };
 
+static struct mfd_cell_acpi_match intel_quark_acpi_match_gpio = {
+       .adr = MFD_ACPI_MATCH_GPIO,
+};
+
 static struct mfd_cell intel_quark_mfd_cells[] = {
        {
                .id = MFD_GPIO_BAR,
                .name = "gpio-dwapb",
+               .acpi_match = &intel_quark_acpi_match_gpio,
                .num_resources = ARRAY_SIZE(intel_quark_gpio_res),
                .resources = intel_quark_gpio_res,
                .ignore_resource_conflicts = true,
@@ -99,6 +112,7 @@ static struct mfd_cell intel_quark_mfd_cells[] = {
        {
                .id = MFD_I2C_BAR,
                .name = "i2c_designware",
+               .acpi_match = &intel_quark_acpi_match_i2c,
                .num_resources = ARRAY_SIZE(intel_quark_i2c_res),
                .resources = intel_quark_i2c_res,
                .ignore_resource_conflicts = true,