diff options
| author | Jean Delvare <khali@linux-fr> | 2007-05-08 00:38:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:28 -0700 |
| commit | 1e73db2536695ef95458b0043234456eb42a8962 (patch) | |
| tree | 54554296395d0edd8b39b5595571b88b378e62eb /drivers/video/riva | |
| parent | 70802c60379fb843c485dfd4cab9e8f527d8fe81 (diff) | |
| download | op-kernel-dev-1e73db2536695ef95458b0043234456eb42a8962.zip op-kernel-dev-1e73db2536695ef95458b0043234456eb42a8962.tar.gz | |
rivafb/nvidiafb: Enable hardware monitoring
Let the hardware monitoring drivers probe the second rivafb/nvidiafb I2C bus
for devices.
Signed-off-by: Jean Delvare <khali@linux-fr>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/rivafb-i2c.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c index 0405e83..ca9e7e8 100644 --- a/drivers/video/riva/rivafb-i2c.c +++ b/drivers/video/riva/rivafb-i2c.c @@ -88,13 +88,15 @@ static int riva_gpio_getsda(void* data) return val; } -static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name) +static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name, + unsigned int i2c_class) { int rc; strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; chan->adapter.id = I2C_HW_B_RIVA; + chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pdev->dev; chan->algo.setsda = riva_gpio_setsda; @@ -135,9 +137,9 @@ void riva_create_i2c_busses(struct riva_par *par) par->chan[0].ddc_base = 0x3e; par->chan[1].ddc_base = 0x36; par->chan[2].ddc_base = 0x50; - riva_setup_i2c_bus(&par->chan[0], "BUS1"); - riva_setup_i2c_bus(&par->chan[1], "BUS2"); - riva_setup_i2c_bus(&par->chan[2], "BUS3"); + riva_setup_i2c_bus(&par->chan[0], "BUS1", 0); + riva_setup_i2c_bus(&par->chan[1], "BUS2", I2C_CLASS_HWMON); + riva_setup_i2c_bus(&par->chan[2], "BUS3", 0); } void riva_delete_i2c_busses(struct riva_par *par) |
