diff options
| author | Ben Skeggs | 2012-07-10 06:36:38 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2012-10-03 05:12:46 +0200 |
| commit | 4196faa8623264b79279a06fd186654c959f2767 (patch) | |
| tree | d84bb1e28744a3dfbafc1e9203a2ea1fda43eb86 /drivers/gpu/drm/nouveau/nv04_dfp.c | |
| parent | drm/nouveau/gpio: port gpio to subdev interfaces (diff) | |
| download | kernel-qcow2-linux-4196faa8623264b79279a06fd186654c959f2767.tar.gz kernel-qcow2-linux-4196faa8623264b79279a06fd186654c959f2767.tar.xz kernel-qcow2-linux-4196faa8623264b79279a06fd186654c959f2767.zip | |
drm/nouveau/i2c: port to subdev interfaces
v2/v3: Ben Skeggs <bskeggs@redhat.com>
- fix typo in default bus selection
- fix accidental loss of destructor
v4: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
- fix typo causing incorrect default i2c port settings when no BMP data
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_dfp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dfp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c index c2675623b7cd..c9835b9bd63d 100644 --- a/drivers/gpu/drm/nouveau/nv04_dfp.c +++ b/drivers/gpu/drm/nouveau/nv04_dfp.c @@ -624,7 +624,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb; - struct nouveau_i2c_chan *i2c = nouveau_i2c_find(dev, 2); + struct nouveau_i2c_port *i2c = nouveau_i2c_find(dev, 2); struct i2c_board_info info[] = { { .type = "sil164", @@ -646,7 +646,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) return; drm_i2c_encoder_init(dev, to_encoder_slave(encoder), - &i2c->adapter, &info[type]); + nouveau_i2c_adapter(i2c), &info[type]); } static const struct drm_encoder_helper_funcs nv04_lvds_helper_funcs = { |