From: Florian Tobias Schandinat Date: Sun, 19 Feb 2012 01:23:20 +0000 (+0000) Subject: viafb: another workaround for OLPCs weird wiring X-Git-Tag: v3.4-rc1~125^2~11^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78145b7a343fe2950478e649e905f557054df884;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 --- diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 4791165..9cfa92e 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) shared->i2c_31 = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_31)); /* FIXME: what is this? */ - printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); - shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + if (!machine_is_olpc()) { + printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); + shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + } printk(KERN_INFO "viafb: Finished I2C bus probing"); }