diff options
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r-- | drivers/video/nvidia/nv_i2c.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index bcde013d0b98..badc1a6c4357 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c | |||
@@ -86,13 +86,15 @@ static int nvidia_gpio_getsda(void *data) | |||
86 | return val; | 86 | return val; |
87 | } | 87 | } |
88 | 88 | ||
89 | static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name) | 89 | static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name, |
90 | unsigned int i2c_class) | ||
90 | { | 91 | { |
91 | int rc; | 92 | int rc; |
92 | 93 | ||
93 | strcpy(chan->adapter.name, name); | 94 | strcpy(chan->adapter.name, name); |
94 | chan->adapter.owner = THIS_MODULE; | 95 | chan->adapter.owner = THIS_MODULE; |
95 | chan->adapter.id = I2C_HW_B_NVIDIA; | 96 | chan->adapter.id = I2C_HW_B_NVIDIA; |
97 | chan->adapter.class = i2c_class; | ||
96 | chan->adapter.algo_data = &chan->algo; | 98 | chan->adapter.algo_data = &chan->algo; |
97 | chan->adapter.dev.parent = &chan->par->pci_dev->dev; | 99 | chan->adapter.dev.parent = &chan->par->pci_dev->dev; |
98 | chan->algo.setsda = nvidia_gpio_setsda; | 100 | chan->algo.setsda = nvidia_gpio_setsda; |
@@ -132,13 +134,13 @@ void nvidia_create_i2c_busses(struct nvidia_par *par) | |||
132 | par->chan[2].par = par; | 134 | par->chan[2].par = par; |
133 | 135 | ||
134 | par->chan[0].ddc_base = 0x36; | 136 | par->chan[0].ddc_base = 0x36; |
135 | nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0"); | 137 | nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", I2C_CLASS_HWMON); |
136 | 138 | ||
137 | par->chan[1].ddc_base = 0x3e; | 139 | par->chan[1].ddc_base = 0x3e; |
138 | nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1"); | 140 | nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", 0); |
139 | 141 | ||
140 | par->chan[2].ddc_base = 0x50; | 142 | par->chan[2].ddc_base = 0x50; |
141 | nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2"); | 143 | nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0); |
142 | } | 144 | } |
143 | 145 | ||
144 | void nvidia_delete_i2c_busses(struct nvidia_par *par) | 146 | void nvidia_delete_i2c_busses(struct nvidia_par *par) |