Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Sakari Ailus <sakari.ailus@iki.fi>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>,
	alsa-devel@alsa-project.org,
	linux-arm-kernel@lists.infradead.org,
	linux-media@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-sh@vger.kernel.org,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Subject: Re: [PATCH 01/10] media: omap3isp: remove unused clkdev
Date: Wed, 4 Mar 2015 00:09:40 +0200
Message-ID: <20150303220940.GX6539@valkosipuli.retiisi.org.uk> (raw)
In-Reply-To: <8241179.DTounjB2Ur@avalon>

Hi Laurent,

On Tue, Mar 03, 2015 at 02:39:14AM +0200, Laurent Pinchart wrote:
> Hi Russell,
> 
> On Monday 02 March 2015 23:54:35 Russell King - ARM Linux wrote:
> > (Combining replies...)
> > 
> > On Tue, Mar 03, 2015 at 12:53:37AM +0200, Sakari Ailus wrote:
> > > Hi Laurent and Russell,
> > > 
> > > On Tue, Mar 03, 2015 at 12:33:44AM +0200, Laurent Pinchart wrote:
> > > > Sakari, does it conflict with the omap3isp DT support ? If so, how would
> > > > you prefer to resolve the conflict ? Russell, would it be fine to merge
> > > > this through Mauro's tree ?
> > 
> > As other changes will depend on this, I'd prefer not to.  The whole
> > "make clk_get() return a unique struct clk" wasn't well tested, and
> > several places broke - and currently clk_add_alias() is broken as a
> > result of that.
> > 
> > I'm trying to get to the longer term solution, where clkdev internally
> > uses a struct clk_hw pointer rather than a struct clk pointer, and I
> > want to clean stuff up first.
> > 
> > If omap3isp needs to keep this code, then so be it - I'll come up with
> > a different patch improving its use of clkdev instead.
> 
> I'm totally fine with removing clkdev from the omap3isp driver if that's 
> easier for you, I'm just concerned about the merge conflict that will result.

There actually appears to be one more dependency, so four patches in total.

What we could also do is to rebase the omap3isp DT support set on top of
Russell's single patch. This way there probably would be no merge conflict,
assuming the patches are exactly the same, and you have no other patches
changing the omap3isp driver.

Alternatively we could postpone the DT support for the omap3isp, but I'd
rather want to avoid that.

-- 
Kind regards,

Sakari Ailus
e-mail: sakari.ailus@iki.fi	XMPP: sailus@retiisi.org.uk

  reply index

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-02 17:05 [PATCH 00/10] initial clkdev cleanups Russell King - ARM Linux
2015-03-02 17:06 ` [PATCH 01/10] media: omap3isp: remove unused clkdev Russell King
2015-03-02 22:33   ` Laurent Pinchart
2015-03-02 22:53     ` Sakari Ailus
2015-03-02 23:54       ` Russell King - ARM Linux
2015-03-03  0:39         ` Laurent Pinchart
2015-03-03 22:09           ` Sakari Ailus [this message]
2015-03-03 23:09         ` Sakari Ailus
2015-03-02 17:06 ` [PATCH 02/10] SH: use clkdev_add_table() Russell King
2015-03-02 17:18   ` Geert Uytterhoeven
2015-03-02 17:06 ` [PATCH 03/10] clk: versatile: convert Integrator IM/PD-1 to " Russell King
2015-03-02 17:06 ` [PATCH 04/10] ARM: lpc32xx: convert " Russell King
2015-03-02 17:06 ` [PATCH 05/10] clkdev: add clkdev_create() helper Russell King
2015-03-02 17:22   ` Geert Uytterhoeven
2015-03-02 17:46     ` Russell King - ARM Linux
2015-03-02 20:36       ` Geert Uytterhoeven
2015-03-02 19:07   ` Stephen Boyd
2015-03-02 21:01     ` Russell King - ARM Linux
2015-03-02 21:54       ` Stephen Boyd
2015-03-02 17:06 ` [PATCH 06/10] ASOC: migor: use clkdev_create() Russell King
2015-03-02 17:29   ` Mark Brown
2015-03-02 17:06 ` [PATCH 07/10] clk: s2mps11: " Russell King
2015-03-02 17:06 ` [PATCH 08/10] ARM: orion: " Russell King
2015-03-03 10:25   ` Thomas Petazzoni
2015-03-02 17:06 ` [PATCH 09/10] ARM: omap2: " Russell King
2015-03-02 17:06 ` [PATCH 10/10] ARM: omap2: use clkdev_add_alias() Russell King
2015-03-03  0:13   ` Tony Lindgren
2015-03-02 21:50 ` [PATCH 00/10] initial clkdev cleanups Stephen Boyd
2015-03-03 15:56   ` Andy Shevchenko

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=20150303220940.GX6539@valkosipuli.retiisi.org.uk \
    --to=sakari.ailus@iki.fi \
    --cc=alsa-devel@alsa-project.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mchehab@osg.samsung.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

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git