Message ID | 1348842336-2153-10-git-send-email-rahul.sharma@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/28/2012 11:25 PM, Rahul Sharma wrote: > This patch adds the support for multiple mixer versions avaialble in > various platform variants. Version is passed as a driver data field > instead of paltform data. > > Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> > --- > drivers/gpu/drm/exynos/exynos_mixer.c | 28 ++++++++++++++++++++++++++++ > 1 files changed, 28 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c > index 8a43ee1..30233a3 100644 > --- a/drivers/gpu/drm/exynos/exynos_mixer.c > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c > @@ -73,6 +73,12 @@ struct mixer_resources { > struct clk *sclk_dac; > }; > > +enum mixer_version_id { > + MXR_VER_INVALID = -1, Does MXR_VER_INVALID enum need really? > + MXR_VER_0_0_0_16, > + MXR_VER_16_0_33_0, > +}; > + > struct mixer_context { > struct device *dev; > int pipe; > @@ -83,6 +89,11 @@ struct mixer_context { > struct mutex mixer_mutex; > struct mixer_resources mixer_res; > struct hdmi_win_data win_data[MIXER_WIN_NR]; > + enum mixer_version_id mxr_ver; > +}; > + > +struct mixer_drv_data { > + enum mixer_version_id version; > }; > > static const u8 filter_y_horiz_tap8[] = { > @@ -1023,11 +1034,24 @@ fail: > return ret; > } > > +static struct mixer_drv_data exynos4_mxr_drv_data = { > + .version = MXR_VER_0_0_0_16, > +}; Add one empty line. > +static struct platform_device_id mixer_driver_types[] = { > + { > + .name = "s5p-mixer", > + .driver_data = (unsigned long)&exynos4_mxr_drv_data, > + }, { > + /* end node */ > + } > +}; > + > static int __devinit mixer_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct exynos_drm_hdmi_context *drm_hdmi_ctx; > struct mixer_context *ctx; > + struct mixer_drv_data *drv; > int ret; > > dev_info(dev, "probe start\n"); > @@ -1047,8 +1071,11 @@ static int __devinit mixer_probe(struct platform_device *pdev) > > mutex_init(&ctx->mixer_mutex); > > + drv = (struct mixer_drv_data *)platform_get_device_id( > + pdev)->driver_data; > ctx->dev = &pdev->dev; > drm_hdmi_ctx->ctx = (void *)ctx; > + ctx->mxr_ver = drv->version; > > platform_set_drvdata(pdev, drm_hdmi_ctx); > > @@ -1101,4 +1128,5 @@ struct platform_driver mixer_driver = { > }, > .probe = mixer_probe, > .remove = __devexit_p(mixer_remove), > + .id_table = mixer_driver_types, > };
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 8a43ee1..30233a3 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -73,6 +73,12 @@ struct mixer_resources { struct clk *sclk_dac; }; +enum mixer_version_id { + MXR_VER_INVALID = -1, + MXR_VER_0_0_0_16, + MXR_VER_16_0_33_0, +}; + struct mixer_context { struct device *dev; int pipe; @@ -83,6 +89,11 @@ struct mixer_context { struct mutex mixer_mutex; struct mixer_resources mixer_res; struct hdmi_win_data win_data[MIXER_WIN_NR]; + enum mixer_version_id mxr_ver; +}; + +struct mixer_drv_data { + enum mixer_version_id version; }; static const u8 filter_y_horiz_tap8[] = { @@ -1023,11 +1034,24 @@ fail: return ret; } +static struct mixer_drv_data exynos4_mxr_drv_data = { + .version = MXR_VER_0_0_0_16, +}; +static struct platform_device_id mixer_driver_types[] = { + { + .name = "s5p-mixer", + .driver_data = (unsigned long)&exynos4_mxr_drv_data, + }, { + /* end node */ + } +}; + static int __devinit mixer_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct exynos_drm_hdmi_context *drm_hdmi_ctx; struct mixer_context *ctx; + struct mixer_drv_data *drv; int ret; dev_info(dev, "probe start\n"); @@ -1047,8 +1071,11 @@ static int __devinit mixer_probe(struct platform_device *pdev) mutex_init(&ctx->mixer_mutex); + drv = (struct mixer_drv_data *)platform_get_device_id( + pdev)->driver_data; ctx->dev = &pdev->dev; drm_hdmi_ctx->ctx = (void *)ctx; + ctx->mxr_ver = drv->version; platform_set_drvdata(pdev, drm_hdmi_ctx); @@ -1101,4 +1128,5 @@ struct platform_driver mixer_driver = { }, .probe = mixer_probe, .remove = __devexit_p(mixer_remove), + .id_table = mixer_driver_types, };
This patch adds the support for multiple mixer versions avaialble in various platform variants. Version is passed as a driver data field instead of paltform data. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> --- drivers/gpu/drm/exynos/exynos_mixer.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)