[media] davinci: vpbe: pass different platform names to handle different ip's

The vpbe driver can handle different platforms DM644X, DM36X and
DM355. To differentiate between this platforms venc_type/vpbe_type
was passed as part of platform data which was incorrect. The correct
way to differentiate to handle this case is by passing different
platform names.
This patch creates platform_device_id[] array supporting different
platforms and assigns id_table to the platform driver, and finally
in the probe gets the actual device by using platform_get_device_id()
and gets the appropriate driver data for that platform.
Taking this approach will also make the DT transition easier.

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 6 insertions, 12 deletions

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index f22572cee49d..b00ade498077 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -689,7 +689,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                         .std            = VENC_STD_ALL,
                         .capabilities   = V4L2_OUT_CAP_STD,
                 },
-                .subdev_name    = VPBE_VENC_SUBDEV_NAME,
+                .subdev_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
                 .default_mode   = "ntsc",
                 .num_modes      = ARRAY_SIZE(dm644xevm_enc_std_timing),
                 .modes          = dm644xevm_enc_std_timing,
@@ -701,7 +701,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                         .type           = V4L2_OUTPUT_TYPE_ANALOG,
                         .capabilities   = V4L2_OUT_CAP_DV_TIMINGS,
                 },
-                .subdev_name    = VPBE_VENC_SUBDEV_NAME,
+                .subdev_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
                 .default_mode   = "480p59_94",
                 .num_modes      = ARRAY_SIZE(dm644xevm_enc_preset_timing),
                 .modes          = dm644xevm_enc_preset_timing,
@@ -712,10 +712,10 @@ static struct vpbe_config dm644xevm_display_cfg = {
         .module_name    = "dm644x-vpbe-display",
         .i2c_adapter_id = 1,
         .osd            = {
-                .module_name    = VPBE_OSD_SUBDEV_NAME,
+                .module_name    = DM644X_VPBE_OSD_SUBDEV_NAME,
         },
         .venc           = {
-                .module_name    = VPBE_VENC_SUBDEV_NAME,
+                .module_name    = DM644X_VPBE_VENC_SUBDEV_NAME,
         },
         .num_outputs    = ARRAY_SIZE(dm644xevm_vpbe_outputs),
         .outputs        = dm644xevm_vpbe_outputs,
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 14e9947bad6e..0849d5768d99 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -669,19 +669,14 @@ static struct resource dm644x_osd_resources[] = {
         },
 };
 
-static struct osd_platform_data dm644x_osd_data = {
-        .vpbe_type     = VPBE_VERSION_1,
-};
-
 static struct platform_device dm644x_osd_dev = {
-        .name           = VPBE_OSD_SUBDEV_NAME,
+        .name           = DM644X_VPBE_OSD_SUBDEV_NAME,
         .id             = -1,
         .num_resources  = ARRAY_SIZE(dm644x_osd_resources),
         .resource       = dm644x_osd_resources,
         .dev            = {
                 .dma_mask               = &dm644x_video_dma_mask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &dm644x_osd_data,
         },
 };
 
@@ -751,12 +746,11 @@ static struct platform_device dm644x_vpbe_display = {
 };
 
 static struct venc_platform_data dm644x_venc_pdata = {
-        .venc_type      = VPBE_VERSION_1,
         .setup_clock    = dm644x_venc_setup_clock,
 };
 
 static struct platform_device dm644x_venc_dev = {
-        .name           = VPBE_VENC_SUBDEV_NAME,
+        .name           = DM644X_VPBE_VENC_SUBDEV_NAME,
         .id             = -1,
         .num_resources  = ARRAY_SIZE(dm644x_venc_resources),
         .resource       = dm644x_venc_resources,