diff options
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi_wp.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi_wp.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/dss/hdmi_wp.c index f5f4ccf50d90..496327e2b21b 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi_wp.c +++ b/drivers/video/fbdev/omap2/dss/hdmi_wp.c @@ -185,7 +185,7 @@ void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt, timings->interlace = param->timings.interlace; } -#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) || defined(CONFIG_OMAP5_DSS_HDMI_AUDIO) void hdmi_wp_audio_config_format(struct hdmi_wp_data *wp, struct hdmi_audio_format *aud_fmt) { @@ -238,37 +238,20 @@ int hdmi_wp_audio_core_req_enable(struct hdmi_wp_data *wp, bool enable) } #endif -#define WP_SIZE 0x200 - int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp) { struct resource *res; - struct resource temp_res; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wp"); if (!res) { - DSSDBG("can't get WP mem resource by name\n"); - /* - * if hwmod/DT doesn't have the memory resource information - * split into HDMI sub blocks by name, we try again by getting - * the platform's first resource. this code will be removed when - * the driver can get the mem resources by name - */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - DSSERR("can't get WP mem resource\n"); - return -EINVAL; - } - - temp_res.start = res->start; - temp_res.end = temp_res.start + WP_SIZE - 1; - res = &temp_res; + DSSERR("can't get WP mem resource\n"); + return -EINVAL; } - wp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!wp->base) { + wp->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(wp->base)) { DSSERR("can't ioremap HDMI WP\n"); - return -ENOMEM; + return PTR_ERR(wp->base); } return 0; |