From: Pavel Machek <pavel@ucw.cz>
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>
Subject: Re: [PATCH 06/11] [media] marvell-ccic: drop ctlr_reset()
Date: Mon, 5 Nov 2018 10:11:35 +0100 [thread overview]
Message-ID: <20181105091135.GB3004@amd> (raw)
In-Reply-To: <20181105073054.24407-7-lkundrak@v3.sk>
[-- Attachment #1: Type: text/plain, Size: 3615 bytes --]
On Mon 2018-11-05 08:30:49, Lubomir Rintel wrote:
> This accesses the clock registers directly and thus is not too
> devicetree friendly. If it's actually needed it needs to be done
> differently.
Device-tree unfriendly is bad, but you still don't want to cause
regression to people needing this.
(Perhaps noone uses this, but...)
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Git blame says: 7c269f454 . Perhaps its authors should be Cced here,
too?
Pavel
> ---
> .../media/platform/marvell-ccic/mcam-core.c | 6 -----
> .../media/platform/marvell-ccic/mcam-core.h | 1 -
> .../media/platform/marvell-ccic/mmp-driver.c | 23 -------------------
> 3 files changed, 30 deletions(-)
>
> diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
> index d24e5b7a3bc5..1b879035948c 100644
> --- a/drivers/media/platform/marvell-ccic/mcam-core.c
> +++ b/drivers/media/platform/marvell-ccic/mcam-core.c
> @@ -1154,12 +1154,6 @@ static void mcam_vb_stop_streaming(struct vb2_queue *vq)
> if (cam->state != S_STREAMING)
> return;
> mcam_ctlr_stop_dma(cam);
> - /*
> - * Reset the CCIC PHY after stopping streaming,
> - * otherwise, the CCIC may be unstable.
> - */
> - if (cam->ctlr_reset)
> - cam->ctlr_reset(cam);
> /*
> * VB2 reclaims the buffers, so we need to forget
> * about them.
> diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
> index ad8955f9f0a1..f93f23faf364 100644
> --- a/drivers/media/platform/marvell-ccic/mcam-core.h
> +++ b/drivers/media/platform/marvell-ccic/mcam-core.h
> @@ -137,7 +137,6 @@ struct mcam_camera {
> int (*plat_power_up) (struct mcam_camera *cam);
> void (*plat_power_down) (struct mcam_camera *cam);
> void (*calc_dphy) (struct mcam_camera *cam);
> - void (*ctlr_reset) (struct mcam_camera *cam);
>
> /*
> * Everything below here is private to the mcam core and
> diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c
> index 70a2833db0d1..92a79ad8a12c 100644
> --- a/drivers/media/platform/marvell-ccic/mmp-driver.c
> +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
> @@ -183,28 +183,6 @@ static void mmpcam_power_down(struct mcam_camera *mcam)
> mcam_clk_disable(mcam);
> }
>
> -static void mcam_ctlr_reset(struct mcam_camera *mcam)
> -{
> - unsigned long val;
> - struct mmp_camera *cam = mcam_to_cam(mcam);
> -
> - if (mcam->ccic_id) {
> - /*
> - * Using CCIC2
> - */
> - val = ioread32(cam->power_regs + REG_CCIC2_CRCR);
> - iowrite32(val & ~0x2, cam->power_regs + REG_CCIC2_CRCR);
> - iowrite32(val | 0x2, cam->power_regs + REG_CCIC2_CRCR);
> - } else {
> - /*
> - * Using CCIC1
> - */
> - val = ioread32(cam->power_regs + REG_CCIC_CRCR);
> - iowrite32(val & ~0x2, cam->power_regs + REG_CCIC_CRCR);
> - iowrite32(val | 0x2, cam->power_regs + REG_CCIC_CRCR);
> - }
> -}
> -
> /*
> * calc the dphy register values
> * There are three dphy registers being used.
> @@ -352,7 +330,6 @@ static int mmpcam_probe(struct platform_device *pdev)
> mcam = &cam->mcam;
> mcam->plat_power_up = mmpcam_power_up;
> mcam->plat_power_down = mmpcam_power_down;
> - mcam->ctlr_reset = mcam_ctlr_reset;
> mcam->calc_dphy = mmpcam_calc_dphy;
> mcam->dev = &pdev->dev;
> mcam->use_smbus = 0;
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
next prev parent reply other threads:[~2018-11-05 9:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 7:30 [PATCH 0/11] media: make Marvell camera work on DT-based OLPC XO-1.75 Lubomir Rintel
2018-11-05 7:30 ` [PATCH 01/11] media: ov7670: hook s_power onto v4l2 core Lubomir Rintel
2018-11-05 7:30 ` [PATCH 02/11] media: ov7670: control clock along with power Lubomir Rintel
2018-11-05 7:30 ` [PATCH 03/11] media: dt-bindings: marvell,mmp2-ccic: Add Marvell MMP2 camera Lubomir Rintel
2018-11-05 7:30 ` [PATCH 04/11] [media] marvell-ccic: fix DMA s/g desc number calculation Lubomir Rintel
2018-11-05 7:30 ` [PATCH 05/11] [media] marvell-ccic: don't generate EOF on parallel bus Lubomir Rintel
2018-11-05 9:07 ` Pavel Machek
2018-11-05 7:30 ` [PATCH 06/11] [media] marvell-ccic: drop ctlr_reset() Lubomir Rintel
2018-11-05 9:11 ` Pavel Machek [this message]
2018-11-05 7:30 ` [PATCH 07/11] [media] marvell-ccic: drop unused stuff Lubomir Rintel
2018-11-05 9:17 ` Pavel Machek
2018-11-05 7:30 ` [PATCH 08/11] [media] marvell-ccic/mmp: enable clock before accessing registers Lubomir Rintel
2018-11-05 9:17 ` Pavel Machek
2018-11-05 7:30 ` [PATCH 09/11] [media] marvell-ccic/mmp: add devicetree support Lubomir Rintel
2018-11-05 9:20 ` Pavel Machek
2018-11-05 7:30 ` [PATCH 10/11] [media] marvell-ccic: use async notifier to get the sensor Lubomir Rintel
2018-11-05 7:30 ` [PATCH 11/11] [media] marvell-ccic: provide a clock for " Lubomir Rintel
2018-11-05 13:01 ` kbuild test robot
2018-11-05 13:01 ` kbuild test robot
2018-11-07 4:42 ` Dan Carpenter
2018-11-07 4:42 ` Dan Carpenter
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=20181105091135.GB3004@amd \
--to=pavel@ucw.cz \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--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=quozl@laptop.org \
--cc=robh+dt@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.