[GIT,PULL] Integrator common clock

Commit Message

Linus Walleij July 4, 2012, 10:52 p.m. UTC

On Tue, Jul 3, 2012 at 11:15 PM, Turquette, Mike <[e-mail]> wrote:

> Thanks for the re-ping.  I've dropped the old ones and taken in these patches.

Thanks!

> I made one trivial change which is to drop "depends on COMMON_CLK"
> from both of the entries in drivers/clk/versatile/Kconfig.  COMMON_CLK
> is implied since we source your Kconfig from within a menu item that
> depends on COMMON_CLK.
>
> Let me know if that is alright with you.

OK!

> One last (maybe stupid) question.  I don't see that ARCH_VERSATILE
> actually uses COMMON_CLK, but uses a legacy platform-specific clk
> framework.  Is that intended?

Versatile is two things (just to add to the confusion):

1) A machine named arch/arm/mach-versatile
2) A platform named arch/arm/plat-versatile encompassing
  the mach-integrator, mach-versatile, mach-realview and mach-vexpress

This new folder is for the latter, but the only *machine* using it in the
versatile family is the Integrator.

So far. I will likely convert mach-realview next, since I can test it.

I don't have the mach-versatile machine sadly. I think only
Catalin and Russell really runs it, except for the QEMU users
which are plentiful.

> I have a second question on this series.  The menu option for
> CLK_VERSATILE is exposed for everybody with these series.  Is that
> necessary?  I'd prefer that folks 'select' it from platform Kconfig
> instead of having it globally exposed.

That's OK, does something like the below make it? This shoves
them (well currently only one...) under a submenu that is
only be visible to folks like me. Tested on Integrator (visible)
and SPEAr (invisible). You'll have to hand-edit it for dropping
the deps on COMMON_CLK though...


From adb168705793bbe3c2522eff068780bb0d9c833e Mon Sep 17 00:00:00 2001
From: Linus Walleij <[e-mail]>
Date: Thu, 5 Jul 2012 00:44:44 +0200
Subject: [PATCH] clk: hide Versatile clocks from the populace

This folds in and hides the Versatile Kconfig submenu unless
CONFIG_CLK_VERSATILE was explicitly selected by the platform(s)
in the current kernel.

Signed-off-by: Linus Walleij <[e-mail]>
---
 drivers/clk/versatile/Kconfig |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Russell King - ARM Linux July 4, 2012, 11:30 p.m. UTC | #1

On Thu, Jul 05, 2012 at 12:52:06AM +0200, Linus Walleij wrote:
> I don't have the mach-versatile machine sadly. I think only
> Catalin and Russell really runs it, except for the QEMU users
> which are plentiful.

I'm probably not going to be able to do it this side of going away,
especially as the Versatile board looks after the power switch for
booting the nightly test builds.

Linus Walleij July 4, 2012, 11:36 p.m. UTC | #2

On Thu, Jul 5, 2012 at 1:30 AM, Russell King - ARM Linux
<[e-mail]> wrote:
> On Thu, Jul 05, 2012 at 12:52:06AM +0200, Linus Walleij wrote:
>> I don't have the mach-versatile machine sadly. I think only
>> Catalin and Russell really runs it, except for the QEMU users
>> which are plentiful.
>
> I'm probably not going to be able to do it this side of going away,
> especially as the Versatile board looks after the power switch for
> booting the nightly test builds.

No big deal, we take this step by step, and Integrator can very well
pave the way for the others as a first step.

But I'm dying for you to post some pictures and text of you ARM
system array some day, it sounds like it's a pretty nice stack of
things you have there :-)

Yours,
Linus Walleij

Patch

diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index 169b1bc..8796005 100644
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -1,8 +1,16 @@ 
 config CLK_VERSATILE
-	bool "Clocks for the ARM Versatile family"
+	bool
 	depends on COMMON_CLK

+if CLK_VERSATILE
+
+menu  "Clocks for the ARM Versatile family"
+
 config CLK_ICST
 	bool "ICST307 VCO clock driver"
 	depends on COMMON_CLK
 	depends on ICST
+
+endmenu
+
+endif