Patchwork [GIT,PULL] Integrator common clock

login
register
mail settings
Submitter Linus Walleij
Date June 19, 2012, 6:53 a.m.
Message ID <CACRpkdYj46c1dpBhassGn2DWOpcmHHUQcUGb6VZ-bVL8bc2PJw@mail.gmail.com>
Download mbox
Permalink /patch/165672/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git

Comments

Linus Walleij - June 19, 2012, 6:53 a.m.
Hi ARM SoC people,

would you consider pulling in the support form common clk in the Integrator,
unless Mike shouts at me? I think I have adressed all review comments.

There will at some point be some trivial merge conflicts in drivers/clk/Makefile
I think, but you're used to that I think...

Yours,
Linus Walleij

The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:

  Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
integrator-clk

for you to fetch changes up to aa3f7190e46514002ddf5b6054d7dc9f6f9f9cb7:

  ARM: integrator: convert to common clock (2012-06-15 09:00:43 +0200)

----------------------------------------------------------------
Linus Walleij (3):
      ARM: integrator: put symbolic bus names on devices
      clk: add versatile ICST307 driver
      ARM: integrator: convert to common clock

 arch/arm/Kconfig                               |    8 +-
 arch/arm/mach-integrator/core.c                |   55 ++----------
 arch/arm/mach-integrator/include/mach/clkdev.h |   26 ------
 arch/arm/mach-integrator/integrator_ap.c       |    8 +-
 arch/arm/mach-integrator/integrator_cp.c       |   69 ++-------------
 arch/arm/plat-versatile/Kconfig                |    3 +
 arch/arm/plat-versatile/Makefile               |    2 +-
 drivers/clk/Kconfig                            |    2 +
 drivers/clk/Makefile                           |    1 +
 drivers/clk/versatile/Kconfig                  |    8 ++
 drivers/clk/versatile/Makefile                 |    3 +
 drivers/clk/versatile/clk-icst.c               |  100 +++++++++++++++++++++
 drivers/clk/versatile/clk-icst.h               |   10 +++
 drivers/clk/versatile/clk-integrator.c         |  111 ++++++++++++++++++++++++
 include/linux/platform_data/clk-integrator.h   |    1 +
 15 files changed, 263 insertions(+), 144 deletions(-)
 delete mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h
 create mode 100644 drivers/clk/versatile/Kconfig
 create mode 100644 drivers/clk/versatile/Makefile
 create mode 100644 drivers/clk/versatile/clk-icst.c
 create mode 100644 drivers/clk/versatile/clk-icst.h
 create mode 100644 drivers/clk/versatile/clk-integrator.c
 create mode 100644 include/linux/platform_data/clk-integrator.h
Turquette, Mike - June 20, 2012, 9:20 p.m.
On 20120619-08:53, Linus Walleij wrote:
> Hi ARM SoC people,
> 
> would you consider pulling in the support form common clk in the Integrator,
> unless Mike shouts at me? I think I have adressed all review comments.
> 

Hi Linus,

Any reason for this code to go through the arm-soc tree instead of
common clk tree?

Thanks,
Mike

> There will at some point be some trivial merge conflicts in drivers/clk/Makefile
> I think, but you're used to that I think...
> 
> Yours,
> Linus Walleij
> 
> The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:
> 
>   Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> integrator-clk
> 
> for you to fetch changes up to aa3f7190e46514002ddf5b6054d7dc9f6f9f9cb7:
> 
>   ARM: integrator: convert to common clock (2012-06-15 09:00:43 +0200)
> 
> ----------------------------------------------------------------
> Linus Walleij (3):
>       ARM: integrator: put symbolic bus names on devices
>       clk: add versatile ICST307 driver
>       ARM: integrator: convert to common clock
> 
>  arch/arm/Kconfig                               |    8 +-
>  arch/arm/mach-integrator/core.c                |   55 ++----------
>  arch/arm/mach-integrator/include/mach/clkdev.h |   26 ------
>  arch/arm/mach-integrator/integrator_ap.c       |    8 +-
>  arch/arm/mach-integrator/integrator_cp.c       |   69 ++-------------
>  arch/arm/plat-versatile/Kconfig                |    3 +
>  arch/arm/plat-versatile/Makefile               |    2 +-
>  drivers/clk/Kconfig                            |    2 +
>  drivers/clk/Makefile                           |    1 +
>  drivers/clk/versatile/Kconfig                  |    8 ++
>  drivers/clk/versatile/Makefile                 |    3 +
>  drivers/clk/versatile/clk-icst.c               |  100 +++++++++++++++++++++
>  drivers/clk/versatile/clk-icst.h               |   10 +++
>  drivers/clk/versatile/clk-integrator.c         |  111 ++++++++++++++++++++++++
>  include/linux/platform_data/clk-integrator.h   |    1 +
>  15 files changed, 263 insertions(+), 144 deletions(-)
>  delete mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h
>  create mode 100644 drivers/clk/versatile/Kconfig
>  create mode 100644 drivers/clk/versatile/Makefile
>  create mode 100644 drivers/clk/versatile/clk-icst.c
>  create mode 100644 drivers/clk/versatile/clk-icst.h
>  create mode 100644 drivers/clk/versatile/clk-integrator.c
>  create mode 100644 include/linux/platform_data/clk-integrator.h
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Linus Walleij - June 21, 2012, 6:23 a.m.
On Wed, Jun 20, 2012 at 11:20 PM, Mike Turquette <mturquette@ti.com> wrote:
> On 20120619-08:53, Linus Walleij wrote:
>> Hi ARM SoC people,
>>
>> would you consider pulling in the support form common clk in the Integrator,
>> unless Mike shouts at me? I think I have adressed all review comments.
>
> Any reason for this code to go through the arm-soc tree instead of
> common clk tree?

There was the Nomadik changes set changing a lot of stuff
that will probably conflict with drivers/clk/Makefile. But that's no
big deal. (Usually Stepgen R fixes these up in -next anyway).

So if you want it in clk instead, feel free to pull it! (Just
tell the ARM SoC people...)

Yours,
Linus Walleij
Linus Walleij - June 22, 2012, 9:58 p.m.
On Thu, Jun 21, 2012 at 8:23 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, Jun 20, 2012 at 11:20 PM, Mike Turquette <mturquette@ti.com> wrote:
>> On 20120619-08:53, Linus Walleij wrote:
>>> Hi ARM SoC people,
>>>
>>> would you consider pulling in the support form common clk in the Integrator,
>>> unless Mike shouts at me? I think I have adressed all review comments.
>>
>> Any reason for this code to go through the arm-soc tree instead of
>> common clk tree?
>
> There was the Nomadik changes set changing a lot of stuff
> that will probably conflict with drivers/clk/Makefile. But that's no
> big deal. (Usually Stepgen R fixes these up in -next anyway).
>
> So if you want it in clk instead, feel free to pull it! (Just
> tell the ARM SoC people...)

I saw that an older version of the patches is on the clk-next branch
in your git, if you're carrying these please take the latest, I created
a branch based off v3.5-rc2 (as I see you're using this) at your
convenience:

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
for-mike

A bigger problem however, is that this branch is not in linux-next
so it doesn't get merge and build testing.

Are you submitting this to Mr Rothwell for testing RealSoonNow
or it it going up through ARM SoC or something?

Yours,
Linus Walleij
Turquette, Mike - June 26, 2012, 1:59 a.m.
On Fri, Jun 22, 2012 at 2:58 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Thu, Jun 21, 2012 at 8:23 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> On Wed, Jun 20, 2012 at 11:20 PM, Mike Turquette <mturquette@ti.com> wrote:
>>> On 20120619-08:53, Linus Walleij wrote:
>>>> Hi ARM SoC people,
>>>>
>>>> would you consider pulling in the support form common clk in the Integrator,
>>>> unless Mike shouts at me? I think I have adressed all review comments.
>>>
>>> Any reason for this code to go through the arm-soc tree instead of
>>> common clk tree?
>>
>> There was the Nomadik changes set changing a lot of stuff
>> that will probably conflict with drivers/clk/Makefile. But that's no
>> big deal. (Usually Stepgen R fixes these up in -next anyway).
>>
>> So if you want it in clk instead, feel free to pull it! (Just
>> tell the ARM SoC people...)
>
> I saw that an older version of the patches is on the clk-next branch
> in your git, if you're carrying these please take the latest, I created
> a branch based off v3.5-rc2 (as I see you're using this) at your
> convenience:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> for-mike
>

Hi Linus,

Thanks for this.  I'll take this into my clk-next tomorrow after I get
some sleep.

> A bigger problem however, is that this branch is not in linux-next
> so it doesn't get merge and build testing.
>
> Are you submitting this to Mr Rothwell for testing RealSoonNow
> or it it going up through ARM SoC or something?
>

Done!  Well, at least my request to Stephen is Done.  You are Cc'd.

Regards,
Mike

> Yours,
> Linus Walleij
Linus Walleij - July 3, 2012, 7:29 p.m.
On Fri, Jun 22, 2012 at 11:58 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:

> I saw that an older version of the patches is on the clk-next branch
> in your git, if you're carrying these please take the latest, I created
> a branch based off v3.5-rc2 (as I see you're using this) at your
> convenience:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> for-mike

This is still the case, please pull this version of the patches
(the last that were posted to the mail list...) or tell me to resend
them if that is better.

Nice to see the tree in -next!
Linus Walleij
Turquette, Mike - July 3, 2012, 9:15 p.m.
On Tue, Jul 3, 2012 at 12:29 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Jun 22, 2012 at 11:58 PM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>
>> I saw that an older version of the patches is on the clk-next branch
>> in your git, if you're carrying these please take the latest, I created
>> a branch based off v3.5-rc2 (as I see you're using this) at your
>> convenience:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
>> for-mike
>
> This is still the case, please pull this version of the patches
> (the last that were posted to the mail list...) or tell me to resend
> them if that is better.
>

Linus,

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

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.

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?

Thanks,
Mike

> Nice to see the tree in -next!
> Linus Walleij
Turquette, Mike - July 3, 2012, 10:40 p.m.
On Tue, Jul 3, 2012 at 12:29 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Jun 22, 2012 at 11:58 PM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>
>> I saw that an older version of the patches is on the clk-next branch
>> in your git, if you're carrying these please take the latest, I created
>> a branch based off v3.5-rc2 (as I see you're using this) at your
>> convenience:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
>> for-mike
>
> This is still the case, please pull this version of the patches
> (the last that were posted to the mail list...) or tell me to resend
> them if that is better.
>

Hi Linus,

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.

Thanks,
Mike

> Nice to see the tree in -next!
> Linus Walleij
Russell King - ARM Linux - July 4, 2012, 11:30 p.m.
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.
On Thu, Jul 5, 2012 at 1:30 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> 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
Linus Walleij - July 5, 2012, 7:44 p.m.
On Tue, Jul 3, 2012 at 11:15 PM, Turquette, Mike <mturquette@ti.com> wrote:

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

I can't see any of them in -next :-(

But now U300 is there though, you get one you loose one ;-)

Linus Walleij
Turquette, Mike - July 5, 2012, 7:55 p.m.
On Thu, Jul 5, 2012 at 12:44 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Tue, Jul 3, 2012 at 11:15 PM, Turquette, Mike <mturquette@ti.com> wrote:
>
>> Thanks for the re-ping.  I've dropped the old ones and taken in these patches.
>
> I can't see any of them in -next :-(
>
> But now U300 is there though, you get one you loose one ;-)
>

I dropped them yesterday (per your request), but I haven't taken in
your latest yet.  Will do shortly.

Regards,
Mike

> Linus Walleij
Linus Walleij - July 8, 2012, 7:06 p.m.
On Sat, Jul 7, 2012 at 2:13 AM, Mike Turquette <mturquette@ti.com> wrote:

> Thanks for clearing that up.  I'm still curious to know whether the
> Kconfig file is even necessary for your case.  In the interest of
> delaying this conversation for even longer, can you look at the below
> patch and let me know if it is OK for you?

Yeah that's all fine, if I find I need more flexible menus down the
road I'll patch it :-)

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij