From: Tero Kristo <t-kristo@ti.com>
To: balbi@ti.com, Nishanth Menon <nm@ti.com>
Cc: devicetree@vger.kernel.org, paul@pwsan.com,
mturquette@linaro.org, tony@atomide.com, rnayak@ti.com,
bcousson@baylibre.com, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCHv13 00/40] ARM: TI SoC clock DT conversion
Date: Fri, 10 Jan 2014 11:52:49 +0200 [thread overview]
Message-ID: <52CFC2F1.706@ti.com> (raw)
In-Reply-To: <20140109231513.GA11648@saruman.home>
On 01/10/2014 01:15 AM, Felipe Balbi wrote:
> Hi,
>
> On Thu, Jan 09, 2014 at 03:22:03PM -0600, Nishanth Menon wrote:
>>> So, bad luck number release for this, as v12 wasn't sufficient still.
>>>
>>> Changes compared to previous version:
>>> - Dropped any changes to generic clock drivers, as it seems impossible
>>> to agree anything in short term, this means the patch set shrank in
>>> size from 49 patches to 40 (first 9 patches were dropped).
>>> - Copy pasted implementation for clk-divider and clk-mux from drivers/clk
>>> to drivers/clk/ti, and made the modifications needed to the TI version
>>> of the clock drivers only (based on discussions with Mike, this is fine)
>>> - Changed name of clk_ll_ops to ti_clk_ll_ops so that this doesn't conflict
>>> with any generic implementation we might have at some point, migrating
>>> this to the generic version should be easy enough also.
>>> - Fixed trace_clk_div_div_ck for omap4, this node was broken in previous
>>> versions and resulted into an orphan clock node
>>> - Fixed compile problem for omap5 only build reported by Felipe
>>> - Fixed a couple of sparse warnings
>>> - changed the mach-omap2/clock.c to use readl_relaxed / writel_relaxed
>>> instead of __raw_readl / __raw_writel
>>>
>>> Testing done:
>>> - omap3-beagle: boot / suspend-resume (RET) / suspend-resume (OFF)
>>> - omap4-panda-es: boot / suspend-resume (RET)
>>> - omap5-uevm: boot
>>> - am335x-bone: boot
>>> - dra7-evm: boot
>>>
>>> Maintainer friendly branches also available:
>>>
>>> tree: https://github.com/t-kristo/linux-pm.git
>>>
>>> clk driver only (Mike): clk-next-dt-clks-v13
>>> DTS data only (Benoit): dts_for_3.14-dt-clks-v13
>>> full-branch (Tony/Paul): 3.13-rc7-dt-clks-v13
>>>
>>> -Tero
>>>
>>
>> Maintainer branches conflicts (using 3.13-rc7-dt-clks-v13):
>> =============================
>> Conflict resolution during rebase to maintainer's -14 branches:
>>
>> 1. (trivial) Against mike's clk-next dbdf6ff Merge branch
>> 'clk-next-unregister' into clk-next
>>
>> Could not apply 2edf7ad... CLK: TI: add DT alias clock registration
>> mechanism
>> conflict drivers/clk/Makefile (trivial fix)
>>
>> 2. (manual, but changes are easy) Against Tony's omap-for-v3.14/be
>> fc6ca98 ARM: OMAP: debug-leds: raw read and write endian fix
>>
>> ARM: OMAP2+: clock: use driver API instead of direct memory read/write
>>
>> 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.
>>
>> 3. I could not detect any merge conflict against Benoit's queued up
>> series (but maybe he has'nt pushed everything to remote tree)..
>>
>>
>> Patch verification report:
>> ==========================
>> Report: http://pastebin.mozilla.org/3976492
>>
>>
>> * sparse warning added in [PATCH 06/40] CLK: ti: add support for ti
>> divider-clock, [PATCH 10/40] clk: ti: add support for basic mux clock
>> +drivers/clk/ti/divider.c: warning: context imbalance in
>> 'ti_clk_divider_set_rate' - different lock contexts for basic block
>> +drivers/clk/ti/mux.c: warning: context imbalance in
>> 'ti_clk_mux_set_parent' - different lock contexts for basic block
>>
>> * checkpatch warning [PATCH 16/40] CLK: TI: add am33xx clock init
>> file, [PATCH 18/40] CLK: TI: add omap3 clock init file
>> WARNING: static const char * array should probably be static const
>> char * const
>>
>>
>> Boot reports:
>> =============
>> - previous orphan clocks seem solved.
>> - All available platforms seem to boot fine and no regression could be
>> seen on initial view
>>
>> OMAP2430:
>> 1. SDP2430
>> before: http://pastebin.mozilla.org/3976359
>> after: http://pastebin.mozilla.org/3976467
>>
>> AM335x:
>> 2. am335x-evm
>> before: http://pastebin.mozilla.org/3976284
>> after: http://pastebin.mozilla.org/3976374
>> 3. am335x-sk
>> before: http://pastebin.mozilla.org/3976295
>> after: http://pastebin.mozilla.org/3976375
>> 4. BeagleBone Black:
>> before: http://pastebin.mozilla.org/3976321
>> after: http://pastebin.mozilla.org/3976441
>>
>> AM3517:
>> 5. am3517-evm
>> before: http://pastebin.mozilla.org/3976297
>> after: http://pastebin.mozilla.org/3976397
>> 6. craneboard
>> before: http://pastebin.mozilla.org/3976322
>> after: http://pastebin.mozilla.org/3976452
>>
>> OMAP3430:
>> 7. ldp
>> before: http://pastebin.mozilla.org/3976356
>> after: http://pastebin.mozilla.org/3976455
>> 8. sdp3430
>> before: http://pastebin.mozilla.org/3976360
>> after: http://pastebin.mozilla.org/3976468
>>
>> OMAP3630/DM3730:
>> 9. am37x-evm
>> before: http://pastebin.mozilla.org/3976300
>> after: http://pastebin.mozilla.org/3976398
>> 10. beagle-XM
>> before: http://pastebin.mozilla.org/3976319
>> after: http://pastebin.mozilla.org/3976440
>>
>> OMAP4430:
>> 11. SDP4430
>> before: http://pastebin.mozilla.org/3976361
>> after: http://pastebin.mozilla.org/3976470
>>
>> OMAP4460:
>> 12. PandaBoard-ES
>> before: http://pastebin.mozilla.org/3976358
>> after: http://pastebin.mozilla.org/3976456
>>
>> OMAP5432:
>> 13. OMAP5uEVM
>> before: http://pastebin.mozilla.org/3976362 (no boot)
>> after: http://pastebin.mozilla.org/3976471 (boot)
>>
>> DRA7:
>> 14. dra7evm
>> before: http://pastebin.mozilla.org/3976354 (no boot)
>> after: http://pastebin.mozilla.org/3976453 (boot)
>>
>> AM437x:
>> 15. am43xx-epos + out-of-tree patches for engineering samples
>> before: http://pastebin.mozilla.org/3976306 (no boot)
>> after: http://pastebin.mozilla.org/3976399 (boot)
>
> to add here, I ran 70 different randconfigs, all seeds are available on
> pastebin (took RMK's 4430sdp seed as a starting point):
>
> am33xx-only.config http://pastebin.com/nVA3xSwb
> am43xx-only.config http://pastebin.com/RbUdKuUh
> dra7xx-only.config http://pastebin.com/ribnaSzS
> omap2-only.config http://pastebin.com/QPUG0wqe
> omap3-only.config http://pastebin.com/B8ctX8yM
> omap4-only.config http://pastebin.com/3D8NAExm
> omap5-only.config http://pastebin.com/3mtQN38Z
>
> Had a total of 16 failing builds, all .configs were also published on
> pastebin:
>
> config-am33xx-only.config-1 http://pastebin.com/5xhXZpev
> config-am33xx-only.config-2 http://pastebin.com/NsrruJcQ
> config-am33xx-only.config-3 http://pastebin.com/CGbB3qb8
> config-am33xx-only.config-4 http://pastebin.com/86cu0uZ1
> config-am43xx-only.config-1 http://pastebin.com/MCBCAd4X
> config-am43xx-only.config-3 http://pastebin.com/hVpCgwSn
> config-am43xx-only.config-4 http://pastebin.com/8SXAKHed
> config-am43xx-only.config-6 http://pastebin.com/59riPMfw
> config-am43xx-only.config-8 http://pastebin.com/03bt2VEZ
> config-am43xx-only.config-9 http://pastebin.com/tePGwtWA
> config-am43xx-only.config-10 http://pastebin.com/nrtXPqrF
> config-omap2-only.config-2 http://pastebin.com/AKyvMqQU
> config-omap2-only.config-4 http://paste.debian.net/75329
> config-omap2-only.config-5 http://paste.debian.net/75330/
> config-omap2-only.config-7 http://paste.debian.net/75332/
> config-omap2-only.config-10 http://paste.debian.net/75333/
>
> Failing configs all build fine on v3.13-rc7 except for
> config-omap2-only.config-10, which fails due to a broken staging driver.
>
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.)
-Tero
-----------
From f552421bbfe85ffba1f10df7a286216aa822a749 Mon Sep 17 00:00:00 2001
From: Tero Kristo <t-kristo@ti.com>
Date: Fri, 10 Jan 2014 11:20:18 +0200
Subject: [PATCH 1/2] ARM: DRA7XX/AM43XX: randconfig fixes
DRA7XX and AM43XX were missing common clock code from the Makefile, which
causes build breakage in DRA7XX / AM43XX only builds once clock support
for these SoCs is added. Add the missing entries to the Makefile as
preparation of this.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 088305f..96a990f 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -191,6 +191,9 @@ obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o
obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o
obj-$(CONFIG_SOC_OMAP5) += $(clock-common)
obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_DRA7XX) += $(clock-common)
+obj-$(CONFIG_SOC_DRA7XX) += dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_AM43XX) += $(clock-common) dpll3xxx.o
# OMAP2 clock rate set data (old "OPP" data)
obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
--
1.7.9.5
------------------
From 14d3443d5fd8d16d4422de84cff16f4bc78f03dc Mon Sep 17 00:00:00 2001
From: Tero Kristo <t-kristo@ti.com>
Date: Fri, 10 Jan 2014 11:25:28 +0200
Subject: [PATCH 2/2] ARM: DRA7XX: Add support for DRA7XX only build
SOC_DRA7XX was under wrong menu within Kconfig file, which prevented
DRA7XX only build. Fixed the kconfig options for this SoC as we are
there. voltage.c needs to be added to the DRA7XX build also, otherwise
DRA7XX only build will fail.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/Kconfig | 18 ++++++++++--------
arch/arm/mach-omap2/Makefile | 1 +
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index dc21df1..e65948a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -76,6 +76,16 @@ config SOC_AM43XX
select ARM_GIC
select MACH_OMAP_GENERIC
+config SOC_DRA7XX
+ bool "TI DRA7XX"
+ depends on ARCH_MULTI_V7
+ select ARCH_OMAP2PLUS
+ select ARM_CPU_SUSPEND if PM
+ select ARM_GIC
+ select CPU_V7
+ select HAVE_SMP
+ select HAVE_ARM_ARCH_TIMER
+
config ARCH_OMAP2PLUS
bool
select ARCH_HAS_BANDGAP
@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
depends on SOC_OMAP5 || SOC_DRA7XX
default y
-config SOC_DRA7XX
- bool "TI DRA7XX"
- select ARM_ARCH_TIMER
- select CPU_V7
- select ARM_GIC
- select HAVE_SMP
- select COMMON_CLK
-
comment "OMAP Core Type"
depends on ARCH_OMAP2
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 96a990f..8ebe9f3 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -132,6 +132,7 @@ obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common)
obj-$(CONFIG_SOC_AM43XX) += $(voltagedomain-common)
obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common)
obj-$(CONFIG_SOC_OMAP5) += voltagedomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX) += $(voltagedomain-common)
# OMAP powerdomain framework
powerdomain-common += powerdomain.o powerdomain-common.o
--
1.7.9.5
next prev parent reply other threads:[~2014-01-10 9:52 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
[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 18/40] CLK: TI: add omap3 clock init file 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
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 [this message]
2014-01-10 16:13 ` Felipe Balbi
2014-01-10 16:30 ` Tero Kristo
2014-01-10 18:51 ` Tony Lindgren
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=52CFC2F1.706@ti.com \
--to=t-kristo@ti.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=tony@atomide.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).