1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index bf13db4e8631..cc4b208ce546 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -37,15 +37,18 @@
 
 #include <subdev/i2c.h>
 
-static struct i2c_board_info nv04_tv_encoder_info[] = {
+static struct nouveau_i2c_board_info nv04_tv_encoder_info[] = {
         {
-                I2C_BOARD_INFO("ch7006", 0x75),
-                .platform_data = &(struct ch7006_encoder_params) {
-                        CH7006_FORMAT_RGB24m12I, CH7006_CLOCK_MASTER,
-                        0, 0, 0,
-                        CH7006_SYNC_SLAVE, CH7006_SYNC_SEPARATED,
-                        CH7006_POUT_3_3V, CH7006_ACTIVE_HSYNC
-                }
+                {
+                        I2C_BOARD_INFO("ch7006", 0x75),
+                        .platform_data = &(struct ch7006_encoder_params) {
+                                CH7006_FORMAT_RGB24m12I, CH7006_CLOCK_MASTER,
+                                0, 0, 0,
+                                CH7006_SYNC_SLAVE, CH7006_SYNC_SEPARATED,
+                                CH7006_POUT_3_3V, CH7006_ACTIVE_HSYNC
+                        }
+                },
+                0
         },
         { }
 };
@@ -229,7 +232,8 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
 
         /* Run the slave-specific initialization */
         ret = drm_i2c_encoder_init(dev, to_encoder_slave(encoder),
-                                   &port->adapter, &nv04_tv_encoder_info[type]);
+                                   &port->adapter,
+                                   &nv04_tv_encoder_info[type].dev);
         if (ret < 0)
                 goto fail_cleanup;