Revert commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f. This fixes a
hang when loading the eeprom driver (see bug #35572.) GMBUS will be
re-enabled later, differently.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Reported-by: Marek Otahal <markotahal at gmail.com>
Tested-by: Yermandu Patapitafious <yermandu.dev at gmail.com>
Tested-by: Andrew Lutomirski <luto at mit.edu>
Acked-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: David Airlie <airlied at linux.ie>
---
drivers/gpu/drm/i915/intel_i2c.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- linux-2.6.39.orig/drivers/gpu/drm/i915/intel_i2c.c 2011-05-20
10:42:40.000000000 +0200
+++ linux-2.6.39/drivers/gpu/drm/i915/intel_i2c.c 2011-06-02
16:26:56.000000000 +0200
@@ -401,8 +401,7 @@ int intel_setup_gmbus(struct drm_device
bus->reg0 = i | GMBUS_RATE_100KHZ;
/* XXX force bit banging until GMBUS is fully debugged */
- if (IS_GEN2(dev))
- bus->force_bit = intel_gpio_create(dev_priv, i);
+ bus->force_bit = intel_gpio_create(dev_priv, i);
}
intel_i2c_reset(dev_priv->dev);
--
Jean Delvare
