* [RFC PATCH 05/18] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS
[not found] ` <0339a6e257048b047bde48da5a87cb5ed4932c5f.1361006882.git.hans.verkuil@cisco.com>
@ 2013-02-16 12:50 ` Prabhakar Lad
2013-02-16 19:18 ` Sekhar Nori
0 siblings, 1 reply; 6+ messages in thread
From: Prabhakar Lad @ 2013-02-16 12:50 UTC (permalink / raw)
To: linux-arm-kernel
Cc'ed Sekhar, DLOS, LAK.
Sekhar Can you Ack this patch for platform changes ?
On Sat, Feb 16, 2013 at 2:58 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> Remove VPBE_ENC_DV_PRESET (the DV_PRESET API is no longer supported) and
> VPBE_ENC_CUSTOM_TIMINGS is renamed to VPBE_ENC_DV_TIMINGS since the old
> "CUSTOM_TIMINGS" name is deprecated in favor of "DV_TIMINGS".
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: Prabhakar Lad <prabhakar.csengg@gmail.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Regards,
--Prabhakar
> ---
> arch/arm/mach-davinci/board-dm644x-evm.c | 4 ++--
> arch/arm/mach-davinci/dm644x.c | 2 +-
> drivers/media/platform/davinci/vpbe.c | 8 ++++----
> drivers/media/platform/davinci/vpbe_display.c | 2 +-
> drivers/media/platform/davinci/vpbe_venc.c | 8 ++++----
> include/media/davinci/vpbe_types.h | 3 +--
> 6 files changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 8e1b4ff..e8dc70b 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -649,7 +649,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
> static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
> {
> .name = "480p59_94",
> - .timings_type = VPBE_ENC_CUSTOM_TIMINGS,
> + .timings_type = VPBE_ENC_DV_TIMINGS,
> .dv_timings = V4L2_DV_BT_CEA_720X480P59_94,
> .interlaced = 0,
> .xres = 720,
> @@ -661,7 +661,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
> },
> {
> .name = "576p50",
> - .timings_type = VPBE_ENC_CUSTOM_TIMINGS,
> + .timings_type = VPBE_ENC_DV_TIMINGS,
> .dv_timings = V4L2_DV_BT_CEA_720X576P50,
> .interlaced = 0,
> .xres = 720,
> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
> index db1dd92..ee0e994 100644
> --- a/arch/arm/mach-davinci/dm644x.c
> +++ b/arch/arm/mach-davinci/dm644x.c
> @@ -706,7 +706,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
> v |= DM644X_VPSS_DACCLKEN;
> writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
> break;
> - case VPBE_ENC_CUSTOM_TIMINGS:
> + case VPBE_ENC_DV_TIMINGS:
> if (pclock <= 27000000) {
> v |= DM644X_VPSS_DACCLKEN;
> writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
> diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
> index 4ca0f9a..2a49f00 100644
> --- a/drivers/media/platform/davinci/vpbe.c
> +++ b/drivers/media/platform/davinci/vpbe.c
> @@ -344,7 +344,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
> return -EINVAL;
>
> for (i = 0; i < output->num_modes; i++) {
> - if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS &&
> + if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS &&
> !memcmp(&output->modes[i].dv_timings,
> dv_timings, sizeof(*dv_timings)))
> break;
> @@ -385,7 +385,7 @@ static int vpbe_g_dv_timings(struct vpbe_device *vpbe_dev,
> struct v4l2_dv_timings *dv_timings)
> {
> if (vpbe_dev->current_timings.timings_type &
> - VPBE_ENC_CUSTOM_TIMINGS) {
> + VPBE_ENC_DV_TIMINGS) {
> *dv_timings = vpbe_dev->current_timings.dv_timings;
> return 0;
> }
> @@ -412,7 +412,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
> return -EINVAL;
>
> for (i = 0; i < output->num_modes; i++) {
> - if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS) {
> + if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) {
> if (j == timings->index)
> break;
> j++;
> @@ -515,7 +515,7 @@ static int vpbe_set_mode(struct vpbe_device *vpbe_dev,
> return vpbe_s_std(vpbe_dev,
> &preset_mode->std_id);
> if (preset_mode->timings_type &
> - VPBE_ENC_CUSTOM_TIMINGS) {
> + VPBE_ENC_DV_TIMINGS) {
> dv_timings =
> preset_mode->dv_timings;
> return vpbe_s_dv_timings(vpbe_dev, &dv_timings);
> diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
> index 5e6b0ca..1f59955 100644
> --- a/drivers/media/platform/davinci/vpbe_display.c
> +++ b/drivers/media/platform/davinci/vpbe_display.c
> @@ -1202,7 +1202,7 @@ vpbe_display_g_dv_timings(struct file *file, void *priv,
> /* Get the given standard in the encoder */
>
> if (vpbe_dev->current_timings.timings_type &
> - VPBE_ENC_CUSTOM_TIMINGS) {
> + VPBE_ENC_DV_TIMINGS) {
> *dv_timings = vpbe_dev->current_timings.dv_timings;
> } else {
> return -EINVAL;
> diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
> index bdbebd5..9546d26 100644
> --- a/drivers/media/platform/davinci/vpbe_venc.c
> +++ b/drivers/media/platform/davinci/vpbe_venc.c
> @@ -313,7 +313,7 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)
> return -EINVAL;
>
> /* Setup clock at VPSS & VENC for SD */
> - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)
> + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)
> return -EINVAL;
>
> venc_enabledigitaloutput(sd, 0);
> @@ -360,7 +360,7 @@ static int venc_set_576p50(struct v4l2_subdev *sd)
> venc->venc_type != VPBE_VERSION_2)
> return -EINVAL;
> /* Setup clock at VPSS & VENC for SD */
> - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 27000000) < 0)
> + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 27000000) < 0)
> return -EINVAL;
>
> venc_enabledigitaloutput(sd, 0);
> @@ -400,7 +400,7 @@ static int venc_set_720p60_internal(struct v4l2_subdev *sd)
> struct venc_state *venc = to_state(sd);
> struct venc_platform_data *pdata = venc->pdata;
>
> - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)
> + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)
> return -EINVAL;
>
> venc_enabledigitaloutput(sd, 0);
> @@ -428,7 +428,7 @@ static int venc_set_1080i30_internal(struct v4l2_subdev *sd)
> struct venc_state *venc = to_state(sd);
> struct venc_platform_data *pdata = venc->pdata;
>
> - if (pdata->setup_clock(VPBE_ENC_CUSTOM_TIMINGS, 74250000) < 0)
> + if (pdata->setup_clock(VPBE_ENC_DV_TIMINGS, 74250000) < 0)
> return -EINVAL;
>
> venc_enabledigitaloutput(sd, 0);
> diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h
> index 9b85396..05dbe0b 100644
> --- a/include/media/davinci/vpbe_types.h
> +++ b/include/media/davinci/vpbe_types.h
> @@ -26,8 +26,7 @@ enum vpbe_version {
> /* vpbe_timing_type - Timing types used in vpbe device */
> enum vpbe_enc_timings_type {
> VPBE_ENC_STD = 0x1,
> - VPBE_ENC_DV_PRESET = 0x2,
> - VPBE_ENC_CUSTOM_TIMINGS = 0x4,
> + VPBE_ENC_DV_TIMINGS = 0x4,
> /* Used when set timings through FB device interface */
> VPBE_ENC_TIMINGS_INVALID = 0x8,
> };
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS
[not found] ` <697f2939eac3755e4b5d74433d160d44672ab7ca.1361006882.git.hans.verkuil@cisco.com>
@ 2013-02-16 12:58 ` Prabhakar Lad
2013-02-16 19:23 ` Sekhar Nori
0 siblings, 1 reply; 6+ messages in thread
From: Prabhakar Lad @ 2013-02-16 12:58 UTC (permalink / raw)
To: linux-arm-kernel
Cc'ed Sekhar, DLOS, LAK.
Sekhar Can you Ack this patch ? Or maybe you can take this patch through
your tree ?
On Sat, Feb 16, 2013 at 2:58 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> The use of V4L2_OUT_CAP_CUSTOM_TIMINGS is deprecated, use DV_TIMINGS instead.
> Note that V4L2_OUT_CAP_CUSTOM_TIMINGS is just a #define for
> V4L2_OUT_CAP_DV_TIMINGS.
>
> At some point in the future these CUSTOM_TIMINGS defines might be removed.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: Prabhakar Lad <prabhakar.csengg@gmail.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Regards,
--Prabhakar
> ---
> arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 6e2f163..43f35d6 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -514,7 +514,7 @@ static const struct vpif_output dm6467_ch0_outputs[] = {
> .index = 1,
> .name = "Component",
> .type = V4L2_OUTPUT_TYPE_ANALOG,
> - .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
> + .capabilities = V4L2_OUT_CAP_DV_TIMINGS,
> },
> .subdev_name = "adv7343",
> .output_route = ADV7343_COMPONENT_ID,
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 05/18] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS
2013-02-16 12:50 ` [RFC PATCH 05/18] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS Prabhakar Lad
@ 2013-02-16 19:18 ` Sekhar Nori
0 siblings, 0 replies; 6+ messages in thread
From: Sekhar Nori @ 2013-02-16 19:18 UTC (permalink / raw)
To: linux-arm-kernel
On 2/16/2013 6:20 PM, Prabhakar Lad wrote:
> Cc'ed Sekhar, DLOS, LAK.
>
> Sekhar Can you Ack this patch for platform changes ?
Acked-by: Sekhar Nori <nsekhar@ti.com>
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS
2013-02-16 12:58 ` [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS Prabhakar Lad
@ 2013-02-16 19:23 ` Sekhar Nori
2013-02-16 19:33 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Sekhar Nori @ 2013-02-16 19:23 UTC (permalink / raw)
To: linux-arm-kernel
On 2/16/2013 6:28 PM, Prabhakar Lad wrote:
> Cc'ed Sekhar, DLOS, LAK.
>
> Sekhar Can you Ack this patch ? Or maybe you can take this patch through
> your tree ?
I can take the patch, but I can only send for v3.10 since for v3.9 ARM
tree is only accepting bug fixes for already accepted code. If you wish
to take this through media tree for v3.9, feel free to add:
Acked-by: Sekhar Nori <nsekhar@ti.com>
Since this appears to be an ARM-only patch, its better to add an 'ARM:'
prefix to the subject line as is the norm with all other ARM patches.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS
2013-02-16 19:23 ` Sekhar Nori
@ 2013-02-16 19:33 ` Hans Verkuil
2013-02-19 10:47 ` Sekhar Nori
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2013-02-16 19:33 UTC (permalink / raw)
To: linux-arm-kernel
On Sat February 16 2013 20:23:39 Sekhar Nori wrote:
> On 2/16/2013 6:28 PM, Prabhakar Lad wrote:
> > Cc'ed Sekhar, DLOS, LAK.
> >
> > Sekhar Can you Ack this patch ? Or maybe you can take this patch through
> > your tree ?
>
> I can take the patch, but I can only send for v3.10 since for v3.9 ARM
> tree is only accepting bug fixes for already accepted code. If you wish
> to take this through media tree for v3.9, feel free to add:
There is no hurry. If you can take this patch for 3.10, then that is fine
by me. This patch series is unlikely to make it in 3.9 anyway, nor does it
need to. Just let me know if you take it, then I can drop it from my patch
series.
Regards,
Hans
>
> Acked-by: Sekhar Nori <nsekhar@ti.com>
>
> Since this appears to be an ARM-only patch, its better to add an 'ARM:'
> prefix to the subject line as is the norm with all other ARM patches.
>
> Thanks,
> Sekhar
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS
2013-02-16 19:33 ` Hans Verkuil
@ 2013-02-19 10:47 ` Sekhar Nori
0 siblings, 0 replies; 6+ messages in thread
From: Sekhar Nori @ 2013-02-19 10:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Hans,
On 2/17/2013 1:03 AM, Hans Verkuil wrote:
> On Sat February 16 2013 20:23:39 Sekhar Nori wrote:
>> On 2/16/2013 6:28 PM, Prabhakar Lad wrote:
>>> Cc'ed Sekhar, DLOS, LAK.
>>>
>>> Sekhar Can you Ack this patch ? Or maybe you can take this patch through
>>> your tree ?
>>
>> I can take the patch, but I can only send for v3.10 since for v3.9 ARM
>> tree is only accepting bug fixes for already accepted code. If you wish
>> to take this through media tree for v3.9, feel free to add:
>
> There is no hurry. If you can take this patch for 3.10, then that is fine
> by me. This patch series is unlikely to make it in 3.9 anyway, nor does it
> need to. Just let me know if you take it, then I can drop it from my patch
> series.
It appears that it will be simpler if you manage the entire series. I
have already acked this one, so please take it through the media tree.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-02-19 10:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <a9599acc7829c431d88b547de87c500968ccb86a.1361006882.git.hans.verkuil@cisco.com>
[not found] ` <1361006901-16103-1-git-send-email-hverkuil@xs4all.nl>
[not found] ` <0339a6e257048b047bde48da5a87cb5ed4932c5f.1361006882.git.hans.verkuil@cisco.com>
2013-02-16 12:50 ` [RFC PATCH 05/18] davinci: remove VPBE_ENC_DV_PRESET and rename VPBE_ENC_CUSTOM_TIMINGS Prabhakar Lad
2013-02-16 19:18 ` Sekhar Nori
[not found] ` <697f2939eac3755e4b5d74433d160d44672ab7ca.1361006882.git.hans.verkuil@cisco.com>
2013-02-16 12:58 ` [RFC PATCH 06/18] davinci: replace V4L2_OUT_CAP_CUSTOM_TIMINGS by V4L2_OUT_CAP_DV_TIMINGS Prabhakar Lad
2013-02-16 19:23 ` Sekhar Nori
2013-02-16 19:33 ` Hans Verkuil
2013-02-19 10:47 ` Sekhar Nori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).