diff options
Diffstat (limited to 'drivers/video/imx-ipu-v3/imx-hdmi.c')
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-hdmi.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c index d63f2c2111..2d5fd98666 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.c +++ b/drivers/video/imx-ipu-v3/imx-hdmi.c @@ -18,8 +18,8 @@ #include <i2c/i2c.h> #include <video/media-bus-format.h> #include <video/vpl.h> -#include <mach/imx6-regs.h> -#include <mach/imx53-regs.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/imx53-regs.h> #include "imx-ipu-v3.h" #include "ipuv3-plane.h" @@ -113,7 +113,7 @@ struct hdmi_data_info { struct dw_hdmi { enum dw_hdmi_devtype dev_type; - struct device_d *dev; + struct device *dev; struct clk *isfr_clk; struct clk *iahb_clk; @@ -1197,6 +1197,7 @@ static struct of_device_id dw_hdmi_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, dw_hdmi_dt_ids); static int dw_hdmi_get_modes(struct dw_hdmi *hdmi, struct display_timings *timings) { @@ -1248,10 +1249,10 @@ static int dw_hdmi_ioctl(struct vpl *vpl, unsigned int port, return 0; } -static int dw_hdmi_probe(struct device_d *dev) +static int dw_hdmi_probe(struct device *dev) { struct resource *iores; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct dw_hdmi *hdmi; int ret; @@ -1347,7 +1348,7 @@ err_isfr: return ret; } -static struct driver_d dw_hdmi_driver = { +static struct driver dw_hdmi_driver = { .probe = dw_hdmi_probe, .of_compatible = dw_hdmi_dt_ids, .name = "imx-hdmi", |