mbox

[GIT,PULL] vexpress: soc changes for v3.8

Message ID 1351271439.9454.36.camel@hornet
State New
Headers show

Pull-request

git://git.linaro.org/people/pawelmoll/linux.git vexpress-clk-soc

Message

Pawel Moll Oct. 26, 2012, 5:10 p.m. UTC
On Fri, 2012-10-26 at 18:00 +0100, Arnd Bergmann wrote:
> Right, it works in -next. Can you rebase the soc changes on top of the
> stuff that went into Mike's tree and resubmit so it also builds in
> arm-soc?

Sure (if I understood you correctly ;-)

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

  Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

  git://git.linaro.org/people/pawelmoll/linux.git vexpress-clk-soc

for you to fetch changes up to 60b3bee64022489ef66a4f56284ccf68b29bd7a9:

  ARM: vexpress: Remove motherboard dependencies in the DTS files (2012-10-26 18:06:11 +0100)

----------------------------------------------------------------
Pawel Moll (7):
      clk: Versatile Express clock generators ("osc") driver
      clk: Common clocks implementation for Versatile Express
      mfd: Versatile Express config infrastructure
      mfd: Versatile Express system registers driver
      ARM: vexpress: Add config bus components and clocks to DTs
      ARM: vexpress: Start using new Versatile Express infrastructure
      ARM: vexpress: Remove motherboard dependencies in the DTS files

 .../devicetree/bindings/arm/vexpress-sysreg.txt    |   50 ++
 Documentation/devicetree/bindings/arm/vexpress.txt |   98 +++-
 arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |  146 +++++-
 arch/arm/boot/dts/vexpress-v2m.dtsi                |  146 +++++-
 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts        |  121 ++++-
 arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  186 ++++++-
 arch/arm/boot/dts/vexpress-v2p-ca5s.dts            |   84 ++-
 arch/arm/boot/dts/vexpress-v2p-ca9.dts             |  136 ++++-
 arch/arm/include/asm/hardware/sp810.h              |    6 +-
 arch/arm/mach-vexpress/Kconfig                     |    4 +-
 arch/arm/mach-vexpress/Makefile                    |    2 +-
 arch/arm/mach-vexpress/ct-ca9x4.c                  |   41 +-
 arch/arm/mach-vexpress/include/mach/motherboard.h  |   81 ---
 arch/arm/mach-vexpress/platsmp.c                   |    3 +-
 arch/arm/mach-vexpress/v2m.c                       |  349 ++++---------
 drivers/clk/Kconfig                                |    8 +-
 drivers/clk/versatile/Makefile                     |    2 +
 drivers/clk/versatile/clk-vexpress-osc.c           |  150 ++++++
 drivers/clk/versatile/clk-vexpress.c               |  142 +++++
 drivers/mfd/Kconfig                                |    6 +
 drivers/mfd/Makefile                               |    1 +
 drivers/mfd/vexpress-config.c                      |  277 ++++++++++
 drivers/mfd/vexpress-sysreg.c                      |  552 ++++++++++++++++++++
 include/linux/vexpress.h                           |  121 +++++
 24 files changed, 2293 insertions(+), 419 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
 create mode 100644 drivers/clk/versatile/clk-vexpress-osc.c
 create mode 100644 drivers/clk/versatile/clk-vexpress.c
 create mode 100644 drivers/mfd/vexpress-config.c
 create mode 100644 drivers/mfd/vexpress-sysreg.c
 create mode 100644 include/linux/vexpress.h

Comments

Arnd Bergmann Oct. 26, 2012, 5:18 p.m. UTC | #1
On Friday 26 October 2012, Pawel Moll wrote:
> On Fri, 2012-10-26 at 18:00 +0100, Arnd Bergmann wrote:
> > Right, it works in -next. Can you rebase the soc changes on top of the
> > stuff that went into Mike's tree and resubmit so it also builds in
> > arm-soc?
> 
> Sure (if I understood you correctly ;-)
> 
> The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
> 
>   Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
> 
> are available in the git repository at:
> 
>   git://git.linaro.org/people/pawelmoll/linux.git vexpress-clk-soc
> 
> for you to fetch changes up to 60b3bee64022489ef66a4f56284ccf68b29bd7a9:
> 
>   ARM: vexpress: Remove motherboard dependencies in the DTS files (2012-10-26 18:06:11 +0100)

This seems to work now, but the commit for the clock driver (46c5737245a2)
does not actually seem to be part of linux-next, unless I'm mistaken.

Are you sure it's the same commit that Mike has in his tree?
Is this not the tree that is part of linux-next?

	Arnd

> ----------------------------------------------------------------
> Pawel Moll (7):
>       clk: Versatile Express clock generators ("osc") driver
>       clk: Common clocks implementation for Versatile Express
>       mfd: Versatile Express config infrastructure
>       mfd: Versatile Express system registers driver
>       ARM: vexpress: Add config bus components and clocks to DTs
>       ARM: vexpress: Start using new Versatile Express infrastructure
>       ARM: vexpress: Remove motherboard dependencies in the DTS files
> 
>  .../devicetree/bindings/arm/vexpress-sysreg.txt    |   50 ++
>  Documentation/devicetree/bindings/arm/vexpress.txt |   98 +++-
>  arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |  146 +++++-
>  arch/arm/boot/dts/vexpress-v2m.dtsi                |  146 +++++-
>  arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts        |  121 ++++-
>  arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  186 ++++++-
>  arch/arm/boot/dts/vexpress-v2p-ca5s.dts            |   84 ++-
>  arch/arm/boot/dts/vexpress-v2p-ca9.dts             |  136 ++++-
>  arch/arm/include/asm/hardware/sp810.h              |    6 +-
>  arch/arm/mach-vexpress/Kconfig                     |    4 +-
>  arch/arm/mach-vexpress/Makefile                    |    2 +-
>  arch/arm/mach-vexpress/ct-ca9x4.c                  |   41 +-
>  arch/arm/mach-vexpress/include/mach/motherboard.h  |   81 ---
>  arch/arm/mach-vexpress/platsmp.c                   |    3 +-
>  arch/arm/mach-vexpress/v2m.c                       |  349 ++++---------
>  drivers/clk/Kconfig                                |    8 +-
>  drivers/clk/versatile/Makefile                     |    2 +
>  drivers/clk/versatile/clk-vexpress-osc.c           |  150 ++++++
>  drivers/clk/versatile/clk-vexpress.c               |  142 +++++
>  drivers/mfd/Kconfig                                |    6 +
>  drivers/mfd/Makefile                               |    1 +
>  drivers/mfd/vexpress-config.c                      |  277 ++++++++++
>  drivers/mfd/vexpress-sysreg.c                      |  552 ++++++++++++++++++++
>  include/linux/vexpress.h                           |  121 +++++
>  24 files changed, 2293 insertions(+), 419 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
>  create mode 100644 drivers/clk/versatile/clk-vexpress-osc.c
>  create mode 100644 drivers/clk/versatile/clk-vexpress.c
>  create mode 100644 drivers/mfd/vexpress-config.c
>  create mode 100644 drivers/mfd/vexpress-sysreg.c
>  create mode 100644 include/linux/vexpress.h
> 
> 
> 
>
Pawel Moll Oct. 26, 2012, 5:45 p.m. UTC | #2
On Fri, 2012-10-26 at 18:18 +0100, Arnd Bergmann wrote:
> Are you sure it's the same commit that Mike has in his tree?
> Is this not the tree that is part of linux-next?

Damn, I am seriously confused now... I'm looking at next-20121026 in
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and
I'm _not_ seeing the vexpress clk drivers! Neither I can find the
patches in git://git.linaro.org/people/mturquette/linux.git clk-next.

Am I doing something wrong or just looking not where I should? You seem
to be able to see some -next vexpress clk patches - where about?

Mike, you said:

On Thu, 2012-10-11 at 23:40 +0100, Mike Turquette wrote:
> I've taken these into my new clk-next towards 3.8.  That branch is not
> yet pushed out publicly but will be after -rc1 is released.
 
Has this happened yet?

Paweł
Arnd Bergmann Oct. 26, 2012, 7:26 p.m. UTC | #3
On Friday 26 October 2012, Pawel Moll wrote:
> 
> On Fri, 2012-10-26 at 18:18 +0100, Arnd Bergmann wrote:
> > Are you sure it's the same commit that Mike has in his tree?
> > Is this not the tree that is part of linux-next?
> 
> Damn, I am seriously confused now... I'm looking at next-20121026 in
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and
> I'm not seeing the vexpress clk drivers! Neither I can find the
> patches in git://git.linaro.org/people/mturquette/linux.git clk-next.
> 
> Am I doing something wrong or just looking not where I should? You seem
> to be able to see some -next vexpress clk patches - where about?

I'm the one who was confused, they are not actually in linux-next for
all I can tell, neither the version you used nor any other.

	Arnd