diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:45:53 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:14:34 -0700 |
| commit | 19f36bfa0021617ce07a79e186673d2da2258b60 (patch) | |
| tree | 7b461a4c43efa70dcb5c4c2406037e24eb7f4011 /drivers/gpu/drm/i915/intel_i2c.c | |
| parent | 02abb80f9003b20257fef399a6bb0e0425e69bc2 (diff) | |
| parent | 5019f0b1345b8f6a8e8a0c7c2f89d4a31819a317 (diff) | |
Merge branch 'spear/dt' into next/dt
This is a rebased version of parts of
git://git.stlinux.com/spear/linux-2.6.git spear-v3.5
which was accidentally based on the linux-next tree and mixed too
many different things. The pinctrl related changes from the same
branch are now in the spear/pinctrl branch of arm-soc.
There are a few non-DT cleanups mixed in here, but fundamentally
it's all related to the DT conversion.
* spear/dt: (9 commits)
ARM: spear: remove most mach/*.h header contents
SPEAr: Update defconfigs
SPEAr: Add PL080 DMA support for 3xx and 6xx
ARM: SPEAr3xx: Add device-tree support to SPEAr3xx architecture
SPEAr3xx: Replace printk() with pr_*()
SPEAr6xx: Add compilation support for dtbs using 'make dtbs'
SPEAr3xx: Add clock instance of usb hosts - ehci and ohci 0 and 1
SPEAr: Use CLKDEV_INIT for defining clk_lookups
ARM: SPEAr600: Change FSMC and SMI clock names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 601c86e664a..8fdc9570021 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -390,7 +390,7 @@ int intel_setup_gmbus(struct drm_device *dev) bus->has_gpio = intel_gpio_setup(bus, i); /* XXX force bit banging until GMBUS is fully debugged */ - if (bus->has_gpio && IS_GEN2(dev)) + if (bus->has_gpio) bus->force_bit = true; } |