From: Sakari Ailus <sakari.ailus@iki.fi>
To: Lubomir Rintel <lkundrak@v3.sk>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
linux-media@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
James Cameron <quozl@laptop.org>, Pavel Machek <pavel@ucw.cz>,
Libin Yang <lbyang@marvell.com>,
Albert Wang <twang13@marvell.com>
Subject: Re: [PATCH v3 02/14] media: ov7670: split register setting from set_framerate() logic
Date: Tue, 15 Jan 2019 10:45:05 +0200 [thread overview]
Message-ID: <20190115084505.42sgpcfs7bev4ity@valkosipuli.retiisi.org.uk> (raw)
In-Reply-To: <f6807e8ec5900b07bbaf6bb7e969b3da9be30f14.camel@v3.sk>
On Tue, Jan 15, 2019 at 09:30:31AM +0100, Lubomir Rintel wrote:
> On Tue, 2019-01-15 at 01:03 +0200, Sakari Ailus wrote:
> > On Tue, Nov 20, 2018 at 11:03:07AM +0100, Lubomir Rintel wrote:
> > > This will allow us to restore the last set frame rate after the device
> > > returns from a power off.
> > >
> > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > >
> > > ---
> > > Changes since v2:
> > > - This patch was added to the series
> > >
> > > drivers/media/i2c/ov7670.c | 30 ++++++++++++++----------------
> > > 1 file changed, 14 insertions(+), 16 deletions(-)
> > >
> > > diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
> > > index ee2302fbdeee..ead0c360df33 100644
> > > --- a/drivers/media/i2c/ov7670.c
> > > +++ b/drivers/media/i2c/ov7670.c
> > > @@ -810,13 +810,24 @@ static void ov7675_get_framerate(struct v4l2_subdev *sd,
> > > (4 * clkrc);
> > > }
> > >
> > > +static int ov7675_apply_framerate(struct v4l2_subdev *sd)
> > > +{
> > > + struct ov7670_info *info = to_state(sd);
> > > + int ret;
> > > +
> > > + ret = ov7670_write(sd, REG_CLKRC, info->clkrc);
> > > + if (ret < 0)
> > > + return ret;
> > > +
> > > + return ov7670_write(sd, REG_DBLV, info->pll_bypass ? DBLV_BYPASS : DBLV_X4);
> > > +}
> > > +
> > > static int ov7675_set_framerate(struct v4l2_subdev *sd,
> > > struct v4l2_fract *tpf)
> > > {
> > > struct ov7670_info *info = to_state(sd);
> > > u32 clkrc;
> > > int pll_factor;
> > > - int ret;
> > >
> > > /*
> > > * The formula is fps = 5/4*pixclk for YUV/RGB and
> > > @@ -825,19 +836,10 @@ static int ov7675_set_framerate(struct v4l2_subdev *sd,
> > > * pixclk = clock_speed / (clkrc + 1) * PLLfactor
> > > *
> > > */
> > > - if (info->pll_bypass) {
> > > - pll_factor = 1;
> > > - ret = ov7670_write(sd, REG_DBLV, DBLV_BYPASS);
> > > - } else {
> > > - pll_factor = PLL_FACTOR;
> > > - ret = ov7670_write(sd, REG_DBLV, DBLV_X4);
> > > - }
> > > - if (ret < 0)
> > > - return ret;
> > > -
> > > if (tpf->numerator == 0 || tpf->denominator == 0) {
> > > clkrc = 0;
> > > } else {
> > > + pll_factor = info->pll_bypass ? 1 : PLL_FACTOR;
> > > clkrc = (5 * pll_factor * info->clock_speed * tpf->numerator) /
> > > (4 * tpf->denominator);
> > > if (info->fmt->mbus_code == MEDIA_BUS_FMT_SBGGR8_1X8)
> > > @@ -859,11 +861,7 @@ static int ov7675_set_framerate(struct v4l2_subdev *sd,
> > > /* Recalculate frame rate */
> > > ov7675_get_framerate(sd, tpf);
> > >
> > > - ret = ov7670_write(sd, REG_CLKRC, info->clkrc);
> > > - if (ret < 0)
> > > - return ret;
> > > -
> > > - return ov7670_write(sd, REG_DBLV, DBLV_X4);
> > > + return ov7675_apply_framerate(sd);
> > > }
> > >
> > > static void ov7670_get_framerate_legacy(struct v4l2_subdev *sd,
> >
> > Unfortunately this one no longer applies due to Jacopo's patch "v4l2: i2c:
> > ov7670: Fix PLL bypass register values" in my tree. Could you resend it if
> > you still think it's useful, please?
> >
> > My tree is here:
> >
> > <URL:https://git.linuxtv.org/sailus/media_tree.git/log/>
> >
> > I've applied the rest there, with a trivial patch I'll send briefly.
>
> Thank you.
>
> It seems that you've accidentally attached the hunks of that patch to a
> previous one though ("media: ov7670: split register setting from
> set_fmt() logic"). There's just one conflicted line to resolve left.
Ouch.
>
> I have a branch based on your tree that reverts the patch first and
> then applies the two cleanly:
>
> git pull https://github.com/hackerspace/olpc-xo175-linux.git lr/ov7670
I'll be rebasing my tree anyway; Mauro picks the patches from my pull
request, not merging it as such.
>
> Feel free to pull, or, if you're fine with rebasing your tree, remove
> the patch from your tree and then just pick the two.
>
> Alternatively, if you prefer a patch by e-mail, please just let me know
> when you've fixed things up in your tree.
I think it'd be easiest that I take these out of the tree and let you
resend just the ov7670 patches. Could you do that? I've updated the master
branch...
--
Kind regards,
Sakari Ailus
next prev parent reply other threads:[~2019-01-15 8:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 10:03 [PATCH v3 0/14] media: make Marvell camera work on DT-based OLPC XO-1.75 Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 01/14] media: ov7670: split register setting from set_fmt() logic Lubomir Rintel
2018-11-22 18:37 ` jacopo mondi
2018-11-28 17:10 ` Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 02/14] media: ov7670: split register setting from set_framerate() logic Lubomir Rintel
2019-01-14 23:03 ` Sakari Ailus
2019-01-15 8:30 ` Lubomir Rintel
2019-01-15 8:45 ` Sakari Ailus [this message]
2018-11-20 10:03 ` [PATCH v3 03/14] media: ov7670: hook s_power onto v4l2 core Lubomir Rintel
2018-11-22 12:21 ` Sakari Ailus
2018-11-28 11:29 ` Lubomir Rintel
2019-01-10 16:59 ` Sakari Ailus
2019-01-13 16:38 ` Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 04/14] media: ov7670: control clock along with power Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 05/14] media: dt-bindings: marvell,mmp2-ccic: Add Marvell MMP2 camera Lubomir Rintel
2018-11-22 20:08 ` jacopo mondi
2019-04-25 14:28 ` Lubomir Rintel
2018-11-27 10:08 ` Sakari Ailus
2018-11-20 10:03 ` [PATCH v3 06/14] [media] marvell-ccic: fix DMA s/g desc number calculation Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 07/14] [media] marvell-ccic: don't generate EOF on parallel bus Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 08/14] Revert "[media] marvell-ccic: reset ccic phy when stop streaming for stability" Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 09/14] [media] marvell-ccic: drop unused stuff Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 10/14] [media] marvell-ccic/mmp: enable clock before accessing registers Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 11/14] [media] marvell-ccic: rename the clocks Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 12/14] [media] marvell-ccic/mmp: add devicetree support Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 13/14] [media] marvell-ccic: use async notifier to get the sensor Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 14/14] [media] marvell-ccic: provide a clock for " Lubomir Rintel
2018-11-23 7:44 ` jacopo mondi
2019-04-25 13:33 ` Lubomir Rintel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190115084505.42sgpcfs7bev4ity@valkosipuli.retiisi.org.uk \
--to=sakari.ailus@iki.fi \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=lbyang@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lkundrak@v3.sk \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=pavel@ucw.cz \
--cc=quozl@laptop.org \
--cc=robh+dt@kernel.org \
--cc=twang13@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).