xf86-video-intel: src/ch7017/ch7017.c src/ch7017/ch7017_reg.h
Eric Anholt
anholt at kemper.freedesktop.org
Thu Nov 8 13:33:59 PST 2007
src/ch7017/ch7017.c | 8 +++++---
src/ch7017/ch7017_reg.h | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 5f92b4c2db9712496b829ee239468e3d14e27d2f
Author: Eric Anholt <eric at anholt.net>
Date: Thu Nov 8 13:31:51 2007 -0800
Bug #12059: Add ch7019 to the list of supported devices for ch7017.
While I'm here, fix the chip description to be LVDS instead of TMDS in i2c
device.
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index f8e2b31..6fc3422 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -99,7 +99,7 @@ ch7017_init(I2CBusPtr b, I2CSlaveAddr addr)
if (priv == NULL)
return NULL;
- priv->d.DevName = "CH7017/7018 TMDS Controller";
+ priv->d.DevName = "CH7017/7018/7019 LVDS Controller";
priv->d.SlaveAddr = addr;
priv->d.pI2CBus = b;
priv->d.StartTimeout = b->StartTimeout;
@@ -111,9 +111,11 @@ ch7017_init(I2CBusPtr b, I2CSlaveAddr addr)
if (!xf86I2CReadByte(&priv->d, CH7017_DEVICE_ID, &val))
goto fail;
- if (val != CH7017_DEVICE_ID_VALUE && val != CH7018_DEVICE_ID_VALUE) {
+ if (val != CH7017_DEVICE_ID_VALUE &&
+ val != CH7018_DEVICE_ID_VALUE &&
+ val != CH7019_DEVICE_ID_VALUE) {
xf86DrvMsg(priv->d.pI2CBus->scrnIndex, X_ERROR,
- "ch7017 not detected, got %d: from %s Slave %d.\n",
+ "ch701x not detected, got %d: from %s Slave %d.\n",
val, priv->d.pI2CBus->BusName, priv->d.SlaveAddr);
goto fail;
}
diff --git a/src/ch7017/ch7017_reg.h b/src/ch7017/ch7017_reg.h
index 3344c4e..7b536bd 100644
--- a/src/ch7017/ch7017_reg.h
+++ b/src/ch7017/ch7017_reg.h
@@ -69,6 +69,7 @@
#define CH7017_DEVICE_ID 0x4b
#define CH7017_DEVICE_ID_VALUE 0x1b
#define CH7018_DEVICE_ID_VALUE 0x1a
+#define CH7019_DEVICE_ID_VALUE 0x19
#define CH7017_XCLK_D2_ADJUST 0x53
#define CH7017_UP_SCALER_COEFF_0 0x55
More information about the xorg-commit
mailing list