| Message ID | 1439580693-5538-2-git-send-email-dustin@cumulusnetworks.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On Fri, Aug 14, 2015 at 12:31:33PM -0700, Dustin Byford wrote: > > Set an ACPI companion for I2C mux channels enumerated through ACPI and > ensure they are scanned for devices. > > Signed-off-by: Dustin Byford <dustin@cumulusnetworks.com> Mika, is this one okay with you? > --- > drivers/i2c/i2c-core.c | 10 ++++++++++ > drivers/i2c/i2c-mux.c | 8 ++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index c83e4d1..23cc8e9 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -171,8 +171,18 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) > if (!adap->dev.parent) > return; > > + /* > + * Determine where to start walking the ACPI namespace. The common > + * case is to start at the adapter's parent device. However, in > + * the case of a "virtual" I2C adapter created to represent a mux > + * channel the parent dev (pointing to the mux device) does not > + * have an ACPI handle. Walk starting at the adapter instead. > + */ > handle = ACPI_HANDLE(adap->dev.parent); > if (!handle) > + handle = ACPI_HANDLE(&adap->dev); > + > + if (!handle) > return; > > status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1, > diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c > index 2ba7c0f..2731b99 100644 > --- a/drivers/i2c/i2c-mux.c > +++ b/drivers/i2c/i2c-mux.c > @@ -25,6 +25,7 @@ > #include <linux/i2c.h> > #include <linux/i2c-mux.h> > #include <linux/of.h> > +#include <linux/acpi.h> > > /* multiplexer per channel data */ > struct i2c_mux_priv { > @@ -173,6 +174,13 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, > } > } > > + /* > + * Now try to populate the mux adapter's ACPI node. > + */ > + if (has_acpi_companion(mux_dev)) > + acpi_preset_companion(&priv->adap.dev, ACPI_COMPANION(mux_dev), > + chan_id); > + > if (force_nr) { > priv->adap.nr = force_nr; > ret = i2c_add_numbered_adapter(&priv->adap); > -- > 2.1.4 >
Hi Wolfram, On Fri Oct 09 22:42, Wolfram Sang wrote: > On Fri, Aug 14, 2015 at 12:31:33PM -0700, Dustin Byford wrote: > > > > Set an ACPI companion for I2C mux channels enumerated through ACPI and > > ensure they are scanned for devices. > > > > Signed-off-by: Dustin Byford <dustin@cumulusnetworks.com> > > Mika, is this one okay with you? I'm working on a revision that incorporates Mika's suggested patch I think you'll want to wait just a bit for that. Thanks, --Dustin -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> I'm working on a revision that incorporates Mika's suggested patch I > think you'll want to wait just a bit for that. I'll happily do. Thanks!
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c83e4d1..23cc8e9 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -171,8 +171,18 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) if (!adap->dev.parent) return; + /* + * Determine where to start walking the ACPI namespace. The common + * case is to start at the adapter's parent device. However, in + * the case of a "virtual" I2C adapter created to represent a mux + * channel the parent dev (pointing to the mux device) does not + * have an ACPI handle. Walk starting at the adapter instead. + */ handle = ACPI_HANDLE(adap->dev.parent); if (!handle) + handle = ACPI_HANDLE(&adap->dev); + + if (!handle) return; status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1, diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 2ba7c0f..2731b99 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -25,6 +25,7 @@ #include <linux/i2c.h> #include <linux/i2c-mux.h> #include <linux/of.h> +#include <linux/acpi.h> /* multiplexer per channel data */ struct i2c_mux_priv { @@ -173,6 +174,13 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, } } + /* + * Now try to populate the mux adapter's ACPI node. + */ + if (has_acpi_companion(mux_dev)) + acpi_preset_companion(&priv->adap.dev, ACPI_COMPANION(mux_dev), + chan_id); + if (force_nr) { priv->adap.nr = force_nr; ret = i2c_add_numbered_adapter(&priv->adap);
Set an ACPI companion for I2C mux channels enumerated through ACPI and ensure they are scanned for devices. Signed-off-by: Dustin Byford <dustin@cumulusnetworks.com> --- drivers/i2c/i2c-core.c | 10 ++++++++++ drivers/i2c/i2c-mux.c | 8 ++++++++ 2 files changed, 18 insertions(+)