Skip to contentSkip to conversation

platform/chrome: Fix i2c-designware adapter name

PATCH Applied Jarkko Nikula 3 participants 3 messages Nov 3, 2015 – Nov 14, 2015

Subsystems (2)
I2C subsystem host drivers Chrome hardware platform support
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 platform/chrome: Fix i2c-designware adapter name

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(-)
drivers/platform/chrome/chromeos_laptop.c +2 -2
index 02072749fff3..2b441e9ae593 100644
@@ -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 */
Signature · 1 line
2.6.2
Tested-by on v1 1/1
#1 lore raw

Jarkko,

Quoted 36 lines · Jarkko Nikula

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(-)
drivers/platform/chrome/chromeos_laptop.c +2 -2
index 02072749fff3..2b441e9ae593 100644
@@ -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 */
Signature · 1 line
2.6.2

Yes, this patch fixes the problem.

Tested-by Jeremiah Mahler <[email protected]>
Signature · 1 line
- Jeremiah Mahler
Applied
#2 lore raw
Quoted 35 lines · Jeremiah Mahler

Jarkko,

Quoted 32 lines · Jarkko Nikula

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(-)
drivers/platform/chrome/chromeos_laptop.c +2 -2
index 02072749fff3..2b441e9ae593 100644
@@ -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",
 };
Quoted 8 lines
Quoted 4 lines
drivers/platform/chrome/chromeos_laptop.c +0 -0
 /* Keep this enum consistent with i2c_adapter_names */
Signature · 1 line
2.6.2

Yes, this patch fixes the problem.

Tested-by Jeremiah Mahler <[email protected]>

Thanks, applied!

-Olof