Commit 50512333 authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab

[media] media: au0828 Use au8522_media_pads enum for pad defines

Change au0828-core to use au8522_media_pads enum defines
instead of hard-coding the pad values.

[mchehab@osg.samsung.com: patch rebased, as the code was
 moved to au0828-video.c. Also added AU8522_PAD_INPUT to the list
 of pad number replacements]
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 82410a98
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*/ */
#include "au0828.h" #include "au0828.h"
#include "au8522.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -681,16 +682,18 @@ static int au0828_create_media_graph(struct au0828_dev *dev) ...@@ -681,16 +682,18 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
if (tuner) { if (tuner) {
ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT, ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
decoder, 0, decoder, AU8522_PAD_INPUT,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
} }
ret = media_create_pad_link(decoder, 1, &dev->vdev.entity, 0, ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT,
&dev->vdev.entity, 0,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
ret = media_create_pad_link(decoder, 2, &dev->vbi_dev.entity, 0, ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT,
&dev->vbi_dev.entity, 0,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
...@@ -716,7 +719,8 @@ static int au0828_create_media_graph(struct au0828_dev *dev) ...@@ -716,7 +719,8 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
case AU0828_VMUX_COMPOSITE: case AU0828_VMUX_COMPOSITE:
case AU0828_VMUX_SVIDEO: case AU0828_VMUX_SVIDEO:
/* FIXME: fix the decoder PAD */ /* FIXME: fix the decoder PAD */
ret = media_create_pad_link(ent, 0, decoder, 0, 0); ret = media_create_pad_link(ent, 0, decoder,
AU8522_PAD_INPUT, 0);
if (ret) if (ret)
return ret; return ret;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment