mbox

Please pull 'next' branch of 5xxx tree

Message ID 20140115221859.50866e87@crub (mailing list archive)
State Not Applicable
Headers show

Pull-request

git://git.denx.de/linux-2.6-agust.git next

Message

Anatolij Gustschin Jan. 15, 2014, 9:18 p.m. UTC
Hi Ben !

please pull mpc5xxx patches for v3.14:

Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.

All these patches have been in linux-next for more then
two weeks now.

Thanks,
Anatolij

The following changes since commit dece8ada993e1764a115bdff0f1effffaa5fc8dc:

  Merge branch 'merge' into next (2013-12-30 15:19:31 +1100)

are available in the git repository at:


  git://git.denx.de/linux-2.6-agust.git next

for you to fetch changes up to bc75059422338197ce487d338ac9c898761e1e61:

  powerpc/512x: dts: add MPC5125 clock specs (2014-01-12 18:59:50 +0100)

----------------------------------------------------------------
Gerhard Sittig (20):
      dts: mpc512x: introduce dt-bindings/clock/ header
      dts: mpc512x: add clock related device tree specs
      clk: mpc512x: introduce COMMON_CLK for MPC512x (disabled)
      clk: mpc512x: add backwards compat to the CCF code
      dts: mpc512x: add clock specs for client lookups
      clk: mpc5xxx: switch to COMMON_CLK, retire PPC_CLOCK
      spi: mpc512x: adjust to OF based clock lookup
      serial: mpc512x: adjust for OF based clock lookup
      serial: mpc512x: setup the PSC FIFO clock as well
      USB: fsl-mph-dr-of: adjust for OF based clock lookup
      mtd: mpc5121_nfc: adjust for OF based clock lookup
      fsl-viu: adjust for OF based clock lookup
      net: can: mscan: adjust to common clock support for mpc512x
      net: can: mscan: remove non-CCF code for MPC512x
      powerpc/mpc512x: improve DIU related clock setup
      clk: mpc512x: remove migration support workarounds
      powerpc/512x: clk: minor comment updates
      powerpc/512x: clk: enforce even SDHC divider values
      powerpc/512x: clk: support MPC5121/5123/5125 SoC variants
      powerpc/512x: dts: add MPC5125 clock specs

 arch/powerpc/Kconfig                          |    5 -
 arch/powerpc/boot/dts/ac14xx.dts              |    7 +
 arch/powerpc/boot/dts/mpc5121.dtsi            |  113 ++-
 arch/powerpc/boot/dts/mpc5125twr.dts          |   53 +-
 arch/powerpc/include/asm/clk_interface.h      |   20 -
 arch/powerpc/include/asm/mpc5121.h            |    7 +-
 arch/powerpc/kernel/Makefile                  |    1 -
 arch/powerpc/kernel/clock.c                   |   82 --
 arch/powerpc/platforms/512x/Kconfig           |    2 +-
 arch/powerpc/platforms/512x/Makefile          |    3 +-
 arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++
 arch/powerpc/platforms/512x/clock.c           |  754 ---------------
 arch/powerpc/platforms/512x/mpc512x_shared.c  |  169 ++--
 arch/powerpc/platforms/52xx/Kconfig           |    2 +-
 drivers/media/platform/fsl-viu.c              |    2 +-
 drivers/mtd/nand/mpc5121_nfc.c                |    2 +-
 drivers/net/can/mscan/mpc5xxx_can.c           |  270 +++---
 drivers/spi/spi-mpc512x-psc.c                 |   26 +-
 drivers/tty/serial/mpc52xx_uart.c             |   90 +-
 drivers/usb/host/fsl-mph-dr-of.c              |   13 +-
 include/dt-bindings/clock/mpc512x-clock.h     |   76 ++
 include/linux/clk-provider.h                  |   16 +
 22 files changed, 1840 insertions(+), 1094 deletions(-)
 delete mode 100644 arch/powerpc/include/asm/clk_interface.h
 delete mode 100644 arch/powerpc/kernel/clock.c
 create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
 delete mode 100644 arch/powerpc/platforms/512x/clock.c
 create mode 100644 include/dt-bindings/clock/mpc512x-clock.h

Comments

Anatolij Gustschin Jan. 28, 2014, 5:46 a.m. UTC | #1
Hi Ben !

On Wed, 15 Jan 2014 22:18:59 +0100
Anatolij Gustschin <agust@denx.de> wrote:

> Hi Ben !
> 
> please pull mpc5xxx patches for v3.14:

Ping.

> Switch mpc512x to the common clock framework and adapt mpc512x
> drivers to use the new clock driver. Old PPC_CLOCK code is
> removed entirely since there are no users any more.
> 
> All these patches have been in linux-next for more then
> two weeks now.
> 
> Thanks,
> Anatolij
> 
> The following changes since commit dece8ada993e1764a115bdff0f1effffaa5fc8dc:
> 
>   Merge branch 'merge' into next (2013-12-30 15:19:31 +1100)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/linux-2.6-agust.git next
> 
> for you to fetch changes up to bc75059422338197ce487d338ac9c898761e1e61:
> 
>   powerpc/512x: dts: add MPC5125 clock specs (2014-01-12 18:59:50 +0100)
> 
> ----------------------------------------------------------------
> Gerhard Sittig (20):
>       dts: mpc512x: introduce dt-bindings/clock/ header
>       dts: mpc512x: add clock related device tree specs
>       clk: mpc512x: introduce COMMON_CLK for MPC512x (disabled)
>       clk: mpc512x: add backwards compat to the CCF code
>       dts: mpc512x: add clock specs for client lookups
>       clk: mpc5xxx: switch to COMMON_CLK, retire PPC_CLOCK
>       spi: mpc512x: adjust to OF based clock lookup
>       serial: mpc512x: adjust for OF based clock lookup
>       serial: mpc512x: setup the PSC FIFO clock as well
>       USB: fsl-mph-dr-of: adjust for OF based clock lookup
>       mtd: mpc5121_nfc: adjust for OF based clock lookup
>       fsl-viu: adjust for OF based clock lookup
>       net: can: mscan: adjust to common clock support for mpc512x
>       net: can: mscan: remove non-CCF code for MPC512x
>       powerpc/mpc512x: improve DIU related clock setup
>       clk: mpc512x: remove migration support workarounds
>       powerpc/512x: clk: minor comment updates
>       powerpc/512x: clk: enforce even SDHC divider values
>       powerpc/512x: clk: support MPC5121/5123/5125 SoC variants
>       powerpc/512x: dts: add MPC5125 clock specs
> 
>  arch/powerpc/Kconfig                          |    5 -
>  arch/powerpc/boot/dts/ac14xx.dts              |    7 +
>  arch/powerpc/boot/dts/mpc5121.dtsi            |  113 ++-
>  arch/powerpc/boot/dts/mpc5125twr.dts          |   53 +-
>  arch/powerpc/include/asm/clk_interface.h      |   20 -
>  arch/powerpc/include/asm/mpc5121.h            |    7 +-
>  arch/powerpc/kernel/Makefile                  |    1 -
>  arch/powerpc/kernel/clock.c                   |   82 --
>  arch/powerpc/platforms/512x/Kconfig           |    2 +-
>  arch/powerpc/platforms/512x/Makefile          |    3 +-
>  arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++
>  arch/powerpc/platforms/512x/clock.c           |  754 ---------------
>  arch/powerpc/platforms/512x/mpc512x_shared.c  |  169 ++--
>  arch/powerpc/platforms/52xx/Kconfig           |    2 +-
>  drivers/media/platform/fsl-viu.c              |    2 +-
>  drivers/mtd/nand/mpc5121_nfc.c                |    2 +-
>  drivers/net/can/mscan/mpc5xxx_can.c           |  270 +++---
>  drivers/spi/spi-mpc512x-psc.c                 |   26 +-
>  drivers/tty/serial/mpc52xx_uart.c             |   90 +-
>  drivers/usb/host/fsl-mph-dr-of.c              |   13 +-
>  include/dt-bindings/clock/mpc512x-clock.h     |   76 ++
>  include/linux/clk-provider.h                  |   16 +
>  22 files changed, 1840 insertions(+), 1094 deletions(-)
>  delete mode 100644 arch/powerpc/include/asm/clk_interface.h
>  delete mode 100644 arch/powerpc/kernel/clock.c
>  create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
>  delete mode 100644 arch/powerpc/platforms/512x/clock.c
>  create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
Benjamin Herrenschmidt Jan. 28, 2014, 6 a.m. UTC | #2
On Tue, 2014-01-28 at 06:46 +0100, Anatolij Gustschin wrote:
> Hi Ben !
> 
> On Wed, 15 Jan 2014 22:18:59 +0100
> Anatolij Gustschin <agust@denx.de> wrote:
> 
> > Hi Ben !
> > 
> > please pull mpc5xxx patches for v3.14:
> 
> Ping.

Oops, you sent that while I was on vacation and I missed it.

Next time, try to send your pull request earlier if possible, I'd like
to have most stuff together before -rc5. I'll try to send this one to
Linus after he has pulled my current one.

Cheers,
Ben.

> > Switch mpc512x to the common clock framework and adapt mpc512x
> > drivers to use the new clock driver. Old PPC_CLOCK code is
> > removed entirely since there are no users any more.
> > 
> > All these patches have been in linux-next for more then
> > two weeks now.
> > 
> > Thanks,
> > Anatolij
> > 
> > The following changes since commit dece8ada993e1764a115bdff0f1effffaa5fc8dc:
> > 
> >   Merge branch 'merge' into next (2013-12-30 15:19:31 +1100)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://git.denx.de/linux-2.6-agust.git next
> > 
> > for you to fetch changes up to bc75059422338197ce487d338ac9c898761e1e61:
> > 
> >   powerpc/512x: dts: add MPC5125 clock specs (2014-01-12 18:59:50 +0100)
> > 
> > ----------------------------------------------------------------
> > Gerhard Sittig (20):
> >       dts: mpc512x: introduce dt-bindings/clock/ header
> >       dts: mpc512x: add clock related device tree specs
> >       clk: mpc512x: introduce COMMON_CLK for MPC512x (disabled)
> >       clk: mpc512x: add backwards compat to the CCF code
> >       dts: mpc512x: add clock specs for client lookups
> >       clk: mpc5xxx: switch to COMMON_CLK, retire PPC_CLOCK
> >       spi: mpc512x: adjust to OF based clock lookup
> >       serial: mpc512x: adjust for OF based clock lookup
> >       serial: mpc512x: setup the PSC FIFO clock as well
> >       USB: fsl-mph-dr-of: adjust for OF based clock lookup
> >       mtd: mpc5121_nfc: adjust for OF based clock lookup
> >       fsl-viu: adjust for OF based clock lookup
> >       net: can: mscan: adjust to common clock support for mpc512x
> >       net: can: mscan: remove non-CCF code for MPC512x
> >       powerpc/mpc512x: improve DIU related clock setup
> >       clk: mpc512x: remove migration support workarounds
> >       powerpc/512x: clk: minor comment updates
> >       powerpc/512x: clk: enforce even SDHC divider values
> >       powerpc/512x: clk: support MPC5121/5123/5125 SoC variants
> >       powerpc/512x: dts: add MPC5125 clock specs
> > 
> >  arch/powerpc/Kconfig                          |    5 -
> >  arch/powerpc/boot/dts/ac14xx.dts              |    7 +
> >  arch/powerpc/boot/dts/mpc5121.dtsi            |  113 ++-
> >  arch/powerpc/boot/dts/mpc5125twr.dts          |   53 +-
> >  arch/powerpc/include/asm/clk_interface.h      |   20 -
> >  arch/powerpc/include/asm/mpc5121.h            |    7 +-
> >  arch/powerpc/kernel/Makefile                  |    1 -
> >  arch/powerpc/kernel/clock.c                   |   82 --
> >  arch/powerpc/platforms/512x/Kconfig           |    2 +-
> >  arch/powerpc/platforms/512x/Makefile          |    3 +-
> >  arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++
> >  arch/powerpc/platforms/512x/clock.c           |  754 ---------------
> >  arch/powerpc/platforms/512x/mpc512x_shared.c  |  169 ++--
> >  arch/powerpc/platforms/52xx/Kconfig           |    2 +-
> >  drivers/media/platform/fsl-viu.c              |    2 +-
> >  drivers/mtd/nand/mpc5121_nfc.c                |    2 +-
> >  drivers/net/can/mscan/mpc5xxx_can.c           |  270 +++---
> >  drivers/spi/spi-mpc512x-psc.c                 |   26 +-
> >  drivers/tty/serial/mpc52xx_uart.c             |   90 +-
> >  drivers/usb/host/fsl-mph-dr-of.c              |   13 +-
> >  include/dt-bindings/clock/mpc512x-clock.h     |   76 ++
> >  include/linux/clk-provider.h                  |   16 +
> >  22 files changed, 1840 insertions(+), 1094 deletions(-)
> >  delete mode 100644 arch/powerpc/include/asm/clk_interface.h
> >  delete mode 100644 arch/powerpc/kernel/clock.c
> >  create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
> >  delete mode 100644 arch/powerpc/platforms/512x/clock.c
> >  create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
Anatolij Gustschin Jan. 28, 2014, 6:22 a.m. UTC | #3
On Tue, 28 Jan 2014 17:00:14 +1100
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> On Tue, 2014-01-28 at 06:46 +0100, Anatolij Gustschin wrote:
> > Hi Ben !
> > 
> > On Wed, 15 Jan 2014 22:18:59 +0100
> > Anatolij Gustschin <agust@denx.de> wrote:
> > 
> > > Hi Ben !
> > > 
> > > please pull mpc5xxx patches for v3.14:
> > 
> > Ping.
> 
> Oops, you sent that while I was on vacation and I missed it.
> 
> Next time, try to send your pull request earlier if possible, I'd like
> to have most stuff together before -rc5. I'll try to send this one to
> Linus after he has pulled my current one.

Okay, I'll try to send it earlier next time.

Thanks,

Anatolij
Benjamin Herrenschmidt Jan. 29, 2014, 7:46 a.m. UTC | #4
On Tue, 2014-01-28 at 17:00 +1100, Benjamin Herrenschmidt wrote:
> On Tue, 2014-01-28 at 06:46 +0100, Anatolij Gustschin wrote:
> > Hi Ben !
> > 
> > On Wed, 15 Jan 2014 22:18:59 +0100
> > Anatolij Gustschin <agust@denx.de> wrote:
> > 
> > > Hi Ben !
> > > 
> > > please pull mpc5xxx patches for v3.14:
> > 
> > Ping.
> 
> Oops, you sent that while I was on vacation and I missed it.
> 
> Next time, try to send your pull request earlier if possible, I'd like
> to have most stuff together before -rc5. I'll try to send this one to
> Linus after he has pulled my current one.

Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I
fixed it up properly in powerpc-next and let me know.

If it's good I'll send to Linus tomorrow.

Cheers,
Ben.
Gerhard Sittig Jan. 29, 2014, 10:11 a.m. UTC | #5
On Wed, Jan 29, 2014 at 18:46 +1100, Benjamin Herrenschmidt wrote:
> 
> On Tue, 2014-01-28 at 17:00 +1100, Benjamin Herrenschmidt wrote:
> > On Tue, 2014-01-28 at 06:46 +0100, Anatolij Gustschin wrote:
> > > Hi Ben !
> > > 
> > > On Wed, 15 Jan 2014 22:18:59 +0100
> > > Anatolij Gustschin <agust@denx.de> wrote:
> > > 
> > > > Hi Ben !
> > > > 
> > > > please pull mpc5xxx patches for v3.14:
> > > 
> > > Ping.
> > 
> > Oops, you sent that while I was on vacation and I missed it.
> > 
> > Next time, try to send your pull request earlier if possible, I'd like
> > to have most stuff together before -rc5. I'll try to send this one to
> > Linus after he has pulled my current one.
> 
> Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I
> fixed it up properly in powerpc-next and let me know.

Did read the merge commit (git show e9a371100dfd), did a build
and run test of

  f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls

and everything looks good.  Thank you!


virtually yours
Gerhard Sittig
Anatolij Gustschin Jan. 29, 2014, 8:50 p.m. UTC | #6
Hi Ben !

On Wed, 29 Jan 2014 18:46:09 +1100
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
...
> Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I
> fixed it up properly in powerpc-next and let me know.

your fix is correct.

Thanks,

Anatolij