void __iomem                    *regs;
        int                             irq;
 
-       struct i2c_client               *ddc_port;
+       struct i2c_adapter              *ddc_adpt;
        struct i2c_client               *hdmiphy_port;
 
        /* current hdmiphy conf regs */
        struct hdmi_context *hdata = ctx_from_connector(connector);
        struct edid *edid;
 
-       if (!hdata->ddc_port)
+       if (!hdata->ddc_adpt)
                return -ENODEV;
 
-       edid = drm_get_edid(connector, hdata->ddc_port->adapter);
+       edid = drm_get_edid(connector, hdata->ddc_adpt);
        if (!edid)
                return -ENODEV;
 
                DRM_ERROR("Failed to find ddc node in device tree\n");
                return -ENODEV;
        }
-       hdata->ddc_port = of_find_i2c_device_by_node(ddc_node);
-       if (!hdata->ddc_port) {
-               DRM_ERROR("Failed to get ddc i2c client by node\n");
+       hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);
+       if (!hdata->ddc_adpt) {
+               DRM_ERROR("Failed to get ddc i2c adapter by node\n");
                return -ENODEV;
        }
 
 err_hdmiphy:
        put_device(&hdata->hdmiphy_port->dev);
 err_ddc:
-       put_device(&hdata->ddc_port->dev);
+       put_device(&hdata->ddc_adpt->dev);
        return ret;
 }
 
        struct hdmi_context *hdata = display->ctx;
 
        put_device(&hdata->hdmiphy_port->dev);
-       put_device(&hdata->ddc_port->dev);
+       put_device(&hdata->ddc_adpt->dev);
        pm_runtime_disable(&pdev->dev);
 
        return 0;