From: Tony Lindgren <tony@atomide.com>
To: Tero Kristo <t-kristo@ti.com>
Cc: balbi@ti.com, Nishanth Menon <nm@ti.com>,
linux-omap@vger.kernel.org, paul@pwsan.com, rnayak@ti.com,
bcousson@baylibre.com, mturquette@linaro.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: Re: [PATCHv13 00/40] ARM: TI SoC clock DT conversion
Date: Fri, 10 Jan 2014 10:51:11 -0800 [thread overview]
Message-ID: <20140110185110.GM31323@atomide.com> (raw)
In-Reply-To: <52D02037.3090705@ti.com>
* Tero Kristo <t-kristo@ti.com> [140110 08:32]:
> On 01/10/2014 06:13 PM, Felipe Balbi wrote:
> >On Fri, Jan 10, 2014 at 11:52:49AM +0200, Tero Kristo wrote:
> >>On 01/10/2014 01:15 AM, Felipe Balbi wrote:
> >>>On Thu, Jan 09, 2014 at 03:22:03PM -0600, Nishanth Menon wrote:
> >>>>
> >>>>conflicts with be changes on Tony's be branch.
> >>>>commit 80f304dd2360cf5d50953c4eb4e902536f6a1263
> >>>> ARM: OMAP2+: raw read and write endian fix
> >>>>
> >>>>Conflict:
> >>>>arch/arm/mach-omap2/clkt_clksel.c
> >>>>arch/arm/mach-omap2/clkt_dpll.c
> >>>>arch/arm/mach-omap2/clkt_iclk.c
> >>>>arch/arm/mach-omap2/clock.c
> >>>>arch/arm/mach-omap2/clock36xx.c
> >>>>arch/arm/mach-omap2/dpll3xxx.c
> >>>>arch/arm/mach-omap2/dpll44xx.c
> >>>>
> >>>>Both change raw_readls -> should now be just clk api instead which
> >>>>already does readl_relaxed etc.. If Tony feels like, then we should
> >>>>probably post a branch based on 'be' branch for easy merge.
This should be a trivial merge conflict to handle, so let's not base
things on the BE changes.
> >>I think all of these fails are caused by the initially bugged
> >>Makefile + Kconfig under mach-omap2. Seems like they can be fixed by
> >>the patches I inlined at the end (will also post them as proper
> >>patches to l-o list after this.) The question is, should Mike go
> >>ahead and merge these along with the base clk patches or how should
> >>we handle them? Patch 1 must be merged, patch 2 is a nice to have one
> >>which allows DRA7 only builds (doing DRA7 only build currently seems
> >>not possible.)
> >
> >If it's OK with Tony, I would suggest having a branch with both patches
> >below which both Tony and Mike merge before merging CCF series. That way
> >we avoid bisection problems.
I can queue those two separately as fixes.
> That reminds me, I think the baseline branch for the mach-omap2
> patches is still somewhat unclear to me, what should be used for
> this? And which patches should be put there (the mach-omap2 patches
> depend on the drivers/clk/ti part basically, so I need to put at
> least those there also.)
I would keep the clock patches against some mainline -rc commit if
possible, and if there are non trivial merge conflicts, the omap
to use as the base is commit adfe9361b236154215d4b0fc8b6d79995394b15c.
In any case, it's probably best that Mike merges this all via his
clock tree unless there non-trivial merge conflicts.
Regards,
Tony
next prev parent reply other threads:[~2014-01-10 18:51 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 14:00 [PATCHv13 00/40] ARM: TI SoC clock DT conversion Tero Kristo
2014-01-09 14:00 ` [PATCHv13 01/40] CLK: TI: add DT alias clock registration mechanism Tero Kristo
2014-01-09 14:00 ` [PATCHv13 02/40] CLK: ti: add init support for clock IP blocks Tero Kristo
2014-01-09 14:00 ` [PATCHv13 03/40] CLK: TI: Add DPLL clock support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 04/40] CLK: TI: add autoidle support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 05/40] clk: ti: add composite clock support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 06/40] CLK: ti: add support for ti divider-clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 07/40] clk: ti: add support for TI fixed factor clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 09/40] CLK: TI: add support for clockdomain binding Tero Kristo
2014-01-09 14:00 ` [PATCHv13 10/40] clk: ti: add support for basic mux clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 11/40] CLK: TI: add omap4 clock init file Tero Kristo
2014-01-09 14:00 ` [PATCHv13 12/40] CLK: TI: add omap5 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 15/40] CLK: TI: add dra7 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 16/40] CLK: TI: add am33xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 18/40] CLK: TI: add omap3 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 20/40] ARM: dts: omap4 clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 22/40] ARM: dts: dra7 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 23/40] ARM: dts: clk: Add apll related clocks Tero Kristo
2014-01-09 14:00 ` [PATCHv13 24/40] ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 25/40] ARM: dts: DRA7: Add PCIe related clock nodes Tero Kristo
[not found] ` <1389276051-1326-1-git-send-email-t-kristo-l0cyMroinI0@public.gmane.org>
2014-01-09 14:00 ` [PATCHv13 08/40] CLK: TI: add support for gate clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 13/40] CLK: TI: omap5: Initialize USB_DPLL at boot Tero Kristo
2014-01-09 14:00 ` [PATCHv13 14/40] CLK: TI: DRA7: Add APLL support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 17/40] CLK: TI: add interface clock support for OMAP3 Tero Kristo
2014-01-09 14:00 ` [PATCHv13 19/40] CLK: TI: add am43xx clock init file Tero Kristo
2014-01-09 14:00 ` [PATCHv13 21/40] ARM: dts: omap5 clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 26/40] ARM: dts: am33xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 27/40] ARM: dts: omap3 " Tero Kristo
2014-01-20 18:00 ` Sebastian Reichel
2014-01-21 7:42 ` Tero Kristo
2014-01-21 14:37 ` [PATCH] ARM: dts: omap3 clocks: simplify ssi aliases Sebastian Reichel
2014-02-13 22:49 ` Tony Lindgren
2014-02-14 1:25 ` Sebastian Reichel
2014-02-14 13:47 ` Tero Kristo
2014-02-28 22:03 ` Tony Lindgren
2014-01-09 14:00 ` [PATCHv13 28/40] ARM: dts: AM35xx: use DT clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 29/40] ARM: dts: am43xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 30/40] ARM: OMAP2+: clock: add support for indexed memmaps Tero Kristo
2014-01-09 14:00 ` [PATCHv13 33/40] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Tero Kristo
2014-01-09 14:00 ` [PATCHv13 35/40] ARM: OMAP2+: io: use new clock init API Tero Kristo
2014-01-09 14:00 ` [PATCHv13 36/40] ARM: OMAP4: remove old clock data and link in new clock init code Tero Kristo
2014-01-09 14:00 ` [PATCHv13 37/40] ARM: OMAP: DRA7: Enable clock init Tero Kristo
2014-01-09 14:00 ` [PATCHv13 38/40] ARM: AM43xx: " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 39/40] ARM: AM33xx: remove old clock data and link in new clock init code Tero Kristo
2014-01-09 14:00 ` [PATCHv13 40/40] ARM: OMAP3: use DT clock init if DT data is available Tero Kristo
2014-01-09 22:23 ` [PATCHv13 00/40] ARM: TI SoC clock DT conversion Mike Turquette
2014-01-10 18:53 ` Tony Lindgren
2014-01-11 9:54 ` Tero Kristo
2014-01-12 0:36 ` Tony Lindgren
2014-01-09 14:00 ` [PATCHv13 31/40] ARM: OMAP2+: clock: use driver API instead of direct memory read/write Tero Kristo
2014-01-09 14:00 ` [PATCHv13 32/40] ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm Tero Kristo
2014-01-09 14:00 ` [PATCHv13 34/40] ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT Tero Kristo
2014-01-09 17:22 ` [PATCHv13 00/40] ARM: TI SoC clock DT conversion Felipe Balbi
2014-01-09 18:40 ` Felipe Balbi
2014-01-09 18:43 ` Felipe Balbi
2014-01-09 21:22 ` Nishanth Menon
2014-01-09 23:15 ` Felipe Balbi
2014-01-10 9:52 ` Tero Kristo
2014-01-10 16:13 ` Felipe Balbi
2014-01-10 16:30 ` Tero Kristo
2014-01-10 18:51 ` Tony Lindgren [this message]
2014-01-14 12:41 ` Tero Kristo
2014-01-14 20:36 ` Felipe Balbi
2014-01-15 2:04 ` Felipe Balbi
2014-01-15 3:16 ` Mike Turquette
2014-01-15 3:50 ` Mike Turquette
2014-01-15 13:41 ` Tero Kristo
2014-01-15 15:59 ` Nishanth Menon
2014-01-15 17:13 ` Tony Lindgren
2014-01-15 19:23 ` Mike Turquette
2014-01-15 19:35 ` Tony Lindgren
2014-01-16 21:39 ` Mike Turquette
2014-01-16 23:05 ` Nishanth Menon
2014-01-17 17:46 ` Kevin Hilman
2014-01-17 17:53 ` Tony Lindgren
2014-01-17 18:11 ` Tero Kristo
2014-01-17 20:58 ` Mike Turquette
2014-01-18 0:02 ` Nishanth Menon
2014-01-18 0:12 ` Olof Johansson
2014-01-18 0:19 ` Nishanth Menon
2014-01-18 0:23 ` Olof Johansson
2014-01-18 1:20 ` Nishanth Menon
2014-01-18 18:11 ` Sebastian Reichel
2014-01-20 17:36 ` Nishanth Menon
2014-01-18 18:07 ` Tony Lindgren
2014-01-17 20:02 ` Nishanth Menon
2014-01-11 16:35 ` Joachim Eastwood
2014-01-13 15:49 ` Tero Kristo
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=20140110185110.GM31323@atomide.com \
--to=tony@atomide.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
--cc=t-kristo@ti.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).