diff mbox

[PATCHv2,13/14] ARM: OMAP24xx: clock: remove legacy clock data

Message ID 5316DCF6.6070808@ti.com
State New
Headers show

Commit Message

Tero Kristo March 5, 2014, 8:14 a.m. UTC 
On 03/04/2014 11:28 PM, Tony Lindgren wrote:
> * Tero Kristo <t-kristo@ti.com> [140304 10:58]:
>> On 03/04/2014 07:32 PM, Tony Lindgren wrote:
>>> * Tero Kristo <t-kristo@ti.com> [140304 01:22]:
>>>> This is no longer needed as clock data is provided through DT.
>>>
>>> Looks like there's a new error even before applying this patch in
>>> the series as I'm now getting the following oops on n8x0. So cannot
>>> test this patch yet.
>>
>> Is this with OMAP2 only boot?
>
> Yeah that's with omap2 only.

That explains it, as previous series was never boot tested in omap2 only 
config (due to build issues.)

I just force pushed the branch with the below additional patch, can you 
check if it works now?

-Tero

------------------------------------

 From b8be115c8bba8088f7b25922ed81c1d5867af974 Mon Sep 17 00:00:00 2001
From: Tero Kristo <t-kristo@ti.com>
Date: Wed, 5 Mar 2014 10:03:38 +0200
Subject: [PATCH 12/15] CLK: TI: gate: add composite interface clock to OMAP2
  only build

Composite interface clock is needed by OMAP2, but it was only built
in for OMAP3. Fixed the conditional build flag checks for this.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
  drivers/clk/ti/gate.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

device_node *node)
  {
  	_of_ti_composite_gate_clk_setup(node, &clkhwops_iclk_wait);

Comments

Tony Lindgren March 5, 2014, 5:08 p.m. UTC | #1 
* Tero Kristo <t-kristo@ti.com> [140305 00:17]:
> On 03/04/2014 11:28 PM, Tony Lindgren wrote:
> >* Tero Kristo <t-kristo@ti.com> [140304 10:58]:
> >>On 03/04/2014 07:32 PM, Tony Lindgren wrote:
> >>>* Tero Kristo <t-kristo@ti.com> [140304 01:22]:
> >>>>This is no longer needed as clock data is provided through DT.
> >>>
> >>>Looks like there's a new error even before applying this patch in
> >>>the series as I'm now getting the following oops on n8x0. So cannot
> >>>test this patch yet.
> >>
> >>Is this with OMAP2 only boot?
> >
> >Yeah that's with omap2 only.
> 
> That explains it, as previous series was never boot tested in omap2
> only config (due to build issues.)
> 
> I just force pushed the branch with the below additional patch, can
> you check if it works now?

Yes seems to work with that thanks. And with the omap2 legacy clock
data removed too, it boots fine on n8x0 and 2430sdp.

I suggest you drop the omap3 legacy data patch from this branch
as it's not omap2 related and cannot be done yet. Then try to get
acks from Paul. And if there are no issues, it seems Mike could take
the whole branch as it seems to merge just fine with what I have
queued. So for all the patches except for the omap3 legacy data
removal, feel free to add:

Acked-by: Tony Lindgren <tony@atomide.com>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren March 5, 2014, 6:10 p.m. UTC | #2 
* Tony Lindgren <tony@atomide.com> [140305 09:12]:
> * Tero Kristo <t-kristo@ti.com> [140305 00:17]:
> > On 03/04/2014 11:28 PM, Tony Lindgren wrote:
> > >* Tero Kristo <t-kristo@ti.com> [140304 10:58]:
> > >>On 03/04/2014 07:32 PM, Tony Lindgren wrote:
> > >>>* Tero Kristo <t-kristo@ti.com> [140304 01:22]:
> > >>>>This is no longer needed as clock data is provided through DT.
> > >>>
> > >>>Looks like there's a new error even before applying this patch in
> > >>>the series as I'm now getting the following oops on n8x0. So cannot
> > >>>test this patch yet.
> > >>
> > >>Is this with OMAP2 only boot?
> > >
> > >Yeah that's with omap2 only.
> > 
> > That explains it, as previous series was never boot tested in omap2
> > only config (due to build issues.)
> > 
> > I just force pushed the branch with the below additional patch, can
> > you check if it works now?
> 
> Yes seems to work with that thanks. And with the omap2 legacy clock
> data removed too, it boots fine on n8x0 and 2430sdp.
> 
> I suggest you drop the omap3 legacy data patch from this branch
> as it's not omap2 related and cannot be done yet. Then try to get
> acks from Paul. And if there are no issues, it seems Mike could take
> the whole branch as it seems to merge just fine with what I have
> queued. So for all the patches except for the omap3 legacy data
> removal, feel free to add:
> 
> Acked-by: Tony Lindgren <tony@atomide.com>

Found one randconfig error with this series when CONFIG_ARCH_OMAP2
is not set:

/drivers/clk/ti/dpll.c:273: undefined reference to `omap2xxx_clkt_dpllcore_init'
drivers/clk/ti/dpll.c:311: undefined reference to `clkhwops_omap2xxx_dpll'

It's also possible the error is the PRM clean up series, but probably
in this series based drivers/clk/ti/dpll.c path.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tero Kristo March 6, 2014, 1:39 p.m. UTC | #3 
On 03/05/2014 08:10 PM, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [140305 09:12]:
>> * Tero Kristo <t-kristo@ti.com> [140305 00:17]:
>>> On 03/04/2014 11:28 PM, Tony Lindgren wrote:
>>>> * Tero Kristo <t-kristo@ti.com> [140304 10:58]:
>>>>> On 03/04/2014 07:32 PM, Tony Lindgren wrote:
>>>>>> * Tero Kristo <t-kristo@ti.com> [140304 01:22]:
>>>>>>> This is no longer needed as clock data is provided through DT.
>>>>>>
>>>>>> Looks like there's a new error even before applying this patch in
>>>>>> the series as I'm now getting the following oops on n8x0. So cannot
>>>>>> test this patch yet.
>>>>>
>>>>> Is this with OMAP2 only boot?
>>>>
>>>> Yeah that's with omap2 only.
>>>
>>> That explains it, as previous series was never boot tested in omap2
>>> only config (due to build issues.)
>>>
>>> I just force pushed the branch with the below additional patch, can
>>> you check if it works now?
>>
>> Yes seems to work with that thanks. And with the omap2 legacy clock
>> data removed too, it boots fine on n8x0 and 2430sdp.
>>
>> I suggest you drop the omap3 legacy data patch from this branch
>> as it's not omap2 related and cannot be done yet. Then try to get
>> acks from Paul. And if there are no issues, it seems Mike could take
>> the whole branch as it seems to merge just fine with what I have
>> queued. So for all the patches except for the omap3 legacy data
>> removal, feel free to add:
>>
>> Acked-by: Tony Lindgren <tony@atomide.com>
>
> Found one randconfig error with this series when CONFIG_ARCH_OMAP2
> is not set:
>
> /drivers/clk/ti/dpll.c:273: undefined reference to `omap2xxx_clkt_dpllcore_init'
> drivers/clk/ti/dpll.c:311: undefined reference to `clkhwops_omap2xxx_dpll'

Yeah, this is in this series. Force pushed a minor update to patch #4 to 
fix this.

I can repost the series if Mike or Paul or someone requests this.

-Tero

>
> It's also possible the error is the PRM clean up series, but probably
> in this series based drivers/clk/ti/dpll.c path.
>
> Regards,
>
> Tony
>

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 3e2999d..474c171 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -185,7 +185,7 @@  of_ti_composite_no_wait_gate_clk_setup(struct 
device_node *node)
  CLK_OF_DECLARE(ti_composite_no_wait_gate_clk, 
"ti,composite-no-wait-gate-clock",
  	       of_ti_composite_no_wait_gate_clk_setup);

-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
  static void __init of_ti_composite_interface_clk_setup(struct