AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rivafb/nvidiafb: Enable hardware monitoring

Browse Source 
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>
This commit is contained in:
Jean Delvare 2007-05-08 00:38:15 -07:00 committed by Linus Torvalds
parent 70802c6037
commit 1e73db2536
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/nvidia/nv_i2c.c
View File

@ -86,13 +86,15 @@ static int nvidia_gpio_getsda(void *data)
return val;
}
static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
static int nvidia_setup_i2c_bus(struct nvidia_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_NVIDIA;
chan->adapter.class = i2c_class;
chan->adapter.algo_data = &chan->algo;
chan->adapter.dev.parent = &chan->par->pci_dev->dev;
chan->algo.setsda = nvidia_gpio_setsda;
@ -132,13 +134,13 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
par->chan[2].par = par;
par->chan[0].ddc_base = 0x36;
nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0");
nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", I2C_CLASS_HWMON);
par->chan[1].ddc_base = 0x3e;
nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1");
nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", 0);
par->chan[2].ddc_base = 0x50;
nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2");
nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0);
}
void nvidia_delete_i2c_busses(struct nvidia_par *par)

10
drivers/video/riva/rivafb-i2c.c
View File

@ -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)