| 1,4 → 1,4 |
|---|
| /* |
| /* |
| * Copyright (c) 2006 Dave Airlie <airlied@linux.ie> |
| * Copyright © 2006-2008,2010 Intel Corporation |
| * Jesse Barnes <jesse.barnes@intel.com> |
| 432,7 → 432,7 |
|---|
| I915_WRITE(GMBUS0 + reg_offset, 0); |
| |
| /* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */ |
| bus->force_bit = true; |
| bus->force_bit = 1; |
| ret = i2c_bit_algo.master_xfer(adapter, msgs, num); |
| |
| out: |
| 491,10 → 491,13 |
|---|
| |
| /* gmbus seems to be broken on i830 */ |
| if (IS_I830(dev)) |
| bus->force_bit = true; |
| bus->force_bit = 1; |
| |
| intel_gpio_setup(bus, port); |
| |
| ret = i2c_add_adapter(&bus->adapter); |
| if (ret) |
| goto err; |
| } |
| |
| intel_i2c_reset(dev_priv->dev); |
| 502,10 → 505,10 |
|---|
| return 0; |
| |
| err: |
| // while (--i) { |
| // struct intel_gmbus *bus = &dev_priv->gmbus[i]; |
| // i2c_del_adapter(&bus->adapter); |
| // } |
| while (--i) { |
| struct intel_gmbus *bus = &dev_priv->gmbus[i]; |
| i2c_del_adapter(&bus->adapter); |
| } |
| return ret; |
| } |
| |
| 529,7 → 532,10 |
|---|
| { |
| struct intel_gmbus *bus = to_intel_gmbus(adapter); |
| |
| bus->force_bit = force_bit; |
| bus->force_bit += force_bit ? 1 : -1; |
| DRM_DEBUG_KMS("%sabling bit-banging on %s. force bit now %d\n", |
| force_bit ? "en" : "dis", adapter->name, |
| bus->force_bit); |
| } |
| |
| void intel_teardown_gmbus(struct drm_device *dev) |
| 539,6 → 545,6 |
|---|
| |
| for (i = 0; i < GMBUS_NUM_PORTS; i++) { |
| struct intel_gmbus *bus = &dev_priv->gmbus[i]; |
| // i2c_del_adapter(&bus->adapter); |
| i2c_del_adapter(&bus->adapter); |
| } |
| } |