From fbd4aa32105125772e84362a7219c2891b395a86 Mon Sep 17 00:00:00 2001 From: Kevin Brace Date: Wed, 24 Feb 2016 01:34:20 -0800 Subject: [PATCH 3/3] Using I2C bus 3 functions that are likely work The code to detect VT1632A DVI transmitter supports detection on I2C bus 2 and 3. The code to detect VT1632A on I2C bus 3 ran through a certain code path, but this was previous used only when P4M800 Pro, VN800, or CN700 chipset was present. Now all devices will go through this code path when dealing with I2C bus 3. Signed-off-by: Kevin Brace --- src/via_i2c.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/via_i2c.c b/src/via_i2c.c index 7d75b29..80bf1a3 100644 --- a/src/via_i2c.c +++ b/src/via_i2c.c @@ -389,29 +389,8 @@ ViaI2CBus3Init(ScrnInfoPtr pScrn) pI2CBus->scrnIndex = pScrn->scrnIndex; pI2CBus->DriverPrivate.ptr = hwp; - switch (pVia->Chipset) { - case VIA_P4M800PRO: - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "using alternative PutBits/GetBits functions for I2C Bus 3\n")); - pI2CBus->I2CPutBits = ViaI2C3SimplePutBits; - pI2CBus->I2CGetBits = ViaI2C3SimpleGetBits; - break; - default: - pI2CBus->I2CAddress = ViaI2C3Address; -#ifdef X_NEED_I2CSTART - pI2CBus->I2CStart = ViaI2C3Start; -#endif - pI2CBus->I2CStop = ViaI2C3Stop; - pI2CBus->I2CPutByte = ViaI2C3PutByte; - pI2CBus->I2CGetByte = ViaI2C3GetByte; - pI2CBus->DriverPrivate.ptr = hwp; - - pI2CBus->BitTimeout = 10; - pI2CBus->ByteTimeout = 10; - pI2CBus->HoldTime = 10; - pI2CBus->StartTimeout = 10; - break; - } + pI2CBus->I2CPutBits = ViaI2C3SimplePutBits; + pI2CBus->I2CGetBits = ViaI2C3SimpleGetBits; if (!xf86I2CBusInit(pI2CBus)) { DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- 1.7.9.5