Commit d80d134182ba ("i2c: designware: Move common probe code into
i2c_dw_probe()") caused the I2C adapter lookup code here to fail for PCI
enumerated i2c-designware because commit changed the adapter name but
didn't update it here.
Fix the I2C adapter lookup by using the "Synopsys DesignWare I2C adapter"
name.
Reported-by: Jeremiah Mahler <[email protected]>
Fixes: d80d134182ba ("i2c: designware: Move common probe code into i2c_dw_probe()")
Signed-off-by: Jarkko Nikula <[email protected]>
---
Hi Jeremiah. This is the same diff I had in a reply to your bug report.
Can you test does this fix work for you as I don't have the HW.
---
drivers/platform/chrome/chromeos_laptop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 02072749fff3..2b441e9ae593 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -47,8 +47,8 @@ static const char *i2c_adapter_names[] = {
"SMBus I801 adapter",
"i915 gmbus vga",
"i915 gmbus panel",
- "i2c-designware-pci",
- "i2c-designware-pci",
+ "Synopsys DesignWare I2C adapter",
+ "Synopsys DesignWare I2C adapter",
};
/* Keep this enum consistent with i2c_adapter_names */
--
2.6.2
Jarkko,
On Tue, Nov 03, 2015 at 01:09:00PM +0200, Jarkko Nikula wrote:
> Commit d80d134182ba ("i2c: designware: Move common probe code into
> i2c_dw_probe()") caused the I2C adapter lookup code here to fail for PCI
> enumerated i2c-designware because commit changed the adapter name but
> didn't update it here.
>
> Fix the I2C adapter lookup by using the "Synopsys DesignWare I2C adapter"
> name.
>
> Reported-by: Jeremiah Mahler <[email protected]>
> Fixes: d80d134182ba ("i2c: designware: Move common probe code into i2c_dw_probe()")
> Signed-off-by: Jarkko Nikula <[email protected]>
> ---
> Hi Jeremiah. This is the same diff I had in a reply to your bug report.
> Can you test does this fix work for you as I don't have the HW.
> ---
> drivers/platform/chrome/chromeos_laptop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
> index 02072749fff3..2b441e9ae593 100644
> --- a/drivers/platform/chrome/chromeos_laptop.c
> +++ b/drivers/platform/chrome/chromeos_laptop.c
> @@ -47,8 +47,8 @@ static const char *i2c_adapter_names[] = {
> "SMBus I801 adapter",
> "i915 gmbus vga",
> "i915 gmbus panel",
> - "i2c-designware-pci",
> - "i2c-designware-pci",
> + "Synopsys DesignWare I2C adapter",
> + "Synopsys DesignWare I2C adapter",
> };
>
> /* Keep this enum consistent with i2c_adapter_names */
> --
> 2.6.2
>
Yes, this patch fixes the problem.
Tested-by: Jeremiah Mahler <[email protected]>
--
- Jeremiah Mahler
On Tue, Nov 03, 2015 at 10:49:59AM -0800, Jeremiah Mahler wrote:
> Jarkko,
>
> On Tue, Nov 03, 2015 at 01:09:00PM +0200, Jarkko Nikula wrote:
> > Commit d80d134182ba ("i2c: designware: Move common probe code into
> > i2c_dw_probe()") caused the I2C adapter lookup code here to fail for PCI
> > enumerated i2c-designware because commit changed the adapter name but
> > didn't update it here.
> >
> > Fix the I2C adapter lookup by using the "Synopsys DesignWare I2C adapter"
> > name.
> >
> > Reported-by: Jeremiah Mahler <[email protected]>
> > Fixes: d80d134182ba ("i2c: designware: Move common probe code into i2c_dw_probe()")
> > Signed-off-by: Jarkko Nikula <[email protected]>
> > ---
> > Hi Jeremiah. This is the same diff I had in a reply to your bug report.
> > Can you test does this fix work for you as I don't have the HW.
> > ---
> > drivers/platform/chrome/chromeos_laptop.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
> > index 02072749fff3..2b441e9ae593 100644
> > --- a/drivers/platform/chrome/chromeos_laptop.c
> > +++ b/drivers/platform/chrome/chromeos_laptop.c
> > @@ -47,8 +47,8 @@ static const char *i2c_adapter_names[] = {
> > "SMBus I801 adapter",
> > "i915 gmbus vga",
> > "i915 gmbus panel",
> > - "i2c-designware-pci",
> > - "i2c-designware-pci",
> > + "Synopsys DesignWare I2C adapter",
> > + "Synopsys DesignWare I2C adapter",
> > };
> >
> > /* Keep this enum consistent with i2c_adapter_names */
> > --
> > 2.6.2
> >
>
> Yes, this patch fixes the problem.
>
> Tested-by: Jeremiah Mahler <[email protected]>
Thanks, applied!
-Olof