diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-18 20:23:20 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-21 03:50:19 -0500 |
commit | 78145b7a343fe2950478e649e905f557054df884 (patch) | |
tree | e1e8bbeb9e78227ad2c5a25615683eddaa60d3e4 | |
parent | c572c8bbff13591f6c9f249d4413f79ddda21e61 (diff) |
viafb: another workaround for OLPCs weird wiring
On OLPC we must not touch this I2C bus or it will hang.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r-- | drivers/video/via/viafbdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 47911658f684..9cfa92ef6bd0 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
@@ -1752,8 +1752,10 @@ static void __devinit i2c_bus_probe(struct viafb_shared *shared) | |||
1752 | shared->i2c_31 = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_31)); | 1752 | shared->i2c_31 = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_31)); |
1753 | 1753 | ||
1754 | /* FIXME: what is this? */ | 1754 | /* FIXME: what is this? */ |
1755 | printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); | 1755 | if (!machine_is_olpc()) { |
1756 | shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); | 1756 | printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); |
1757 | shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); | ||
1758 | } | ||
1757 | 1759 | ||
1758 | printk(KERN_INFO "viafb: Finished I2C bus probing"); | 1760 | printk(KERN_INFO "viafb: Finished I2C bus probing"); |
1759 | } | 1761 | } |