Patchwork [GIT,PULL,3/3] ARM: mvebu: soc for v3.10

login
register
mail settings
Submitter Jason
Date March 17, 2013, 8:15 p.m.
Message ID <1363551341.10D8ED563.32562@triton>
Download mbox
Permalink /patch/228317/
State New
Headers show

Pull-request

git://git.infradead.org/users/jcooper/linux.git tags/soc_changes_for_v3.10

Comments

Jason - March 17, 2013, 8:15 p.m.
The following changes since commit 207b6b8da3195dafe3e0d2143262640ddace74af:

  Merge branch 'mvebu/drivers' into mvebu/soc

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/soc_changes_for_v3.10

for you to fetch changes up to c135394ade12b00be1fdd04f68ff8470207a9b32:

  arm: plat-orion: remove addr-map code

----------------------------------------------------------------
mvebu soc changes for v3.10
    
     - use mvebu-mbus driver for:
        - kirkwood
        - dove
        - orion5x
        - mv78xx
        - mvebu
    
     - depends
        - tags/cleanup_for_v3.10 (mvebu/cleanup)
        - tags/drivers_for_v3.10 (mvebu/drivers)
----------------------------------------------------------------
Thomas Petazzoni (6):
      arm: mach-mvebu: convert to use mvebu-mbus driver
      arm: mach-kirkwood: convert to use mvebu-mbus driver
      arm: mach-dove: convert to use mvebu-mbus driver
      arm: mach-orion5x: convert to use mvebu-mbus driver
      arm: mach-mv78xx0: convert to use the mvebu-mbus driver
      arm: plat-orion: remove addr-map code

 arch/arm/Kconfig                                |   4 +
 arch/arm/boot/dts/armada-370-xp.dtsi            |   5 -
 arch/arm/boot/dts/armada-370.dtsi               |   3 +
 arch/arm/boot/dts/armada-xp.dtsi                |   3 +
 arch/arm/boot/dts/dove.dtsi                     |   3 +-
 arch/arm/boot/dts/kirkwood.dtsi                 |   3 +-
 arch/arm/boot/dts/orion5x-88f5182.dtsi          |  18 ++
 .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts |   2 +-
 arch/arm/mach-dove/Makefile                     |   2 +-
 arch/arm/mach-dove/addr-map.c                   | 125 -------------
 arch/arm/mach-dove/board-dt.c                   |  13 +-
 arch/arm/mach-dove/common.c                     |  39 ++++-
 arch/arm/mach-dove/common.h                     |   2 +-
 arch/arm/mach-dove/include/mach/dove.h          |   5 +
 arch/arm/mach-kirkwood/Makefile                 |   2 +-
 arch/arm/mach-kirkwood/addr-map.c               |  91 ----------
 arch/arm/mach-kirkwood/board-dt.c               |  19 +-
 arch/arm/mach-kirkwood/common.c                 |  38 +++-
 arch/arm/mach-kirkwood/common.h                 |   2 +-
 arch/arm/mach-kirkwood/include/mach/kirkwood.h  |   7 +-
 arch/arm/mach-kirkwood/pcie.c                   |   1 -
 arch/arm/mach-mv78xx0/Makefile                  |   2 +-
 arch/arm/mach-mv78xx0/addr-map.c                |  93 ----------
 arch/arm/mach-mv78xx0/common.c                  |  10 +-
 arch/arm/mach-mv78xx0/include/mach/mv78xx0.h    |   8 +-
 arch/arm/mach-mv78xx0/pcie.c                    |  21 ++-
 arch/arm/mach-mvebu/Kconfig                     |   1 +
 arch/arm/mach-mvebu/Makefile                    |   2 +-
 arch/arm/mach-mvebu/addr-map.c                  | 137 ---------------
 arch/arm/mach-mvebu/armada-370-xp.c             |   2 +
 arch/arm/mach-mvebu/platsmp.c                   |   2 +
 arch/arm/mach-orion5x/Makefile                  |   2 +-
 arch/arm/mach-orion5x/addr-map.c                | 155 ----------------
 arch/arm/mach-orion5x/board-dt.c                |  24 ++-
 arch/arm/mach-orion5x/common.c                  |  49 +++++-
 arch/arm/mach-orion5x/common.h                  |  13 +-
 arch/arm/mach-orion5x/d2net-setup.c             |   4 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         |  13 +-
 arch/arm/mach-orion5x/dns323-setup.c            |   3 +-
 arch/arm/mach-orion5x/edmini_v2-setup.c         |   4 +-
 arch/arm/mach-orion5x/include/mach/orion5x.h    |   6 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       |   8 +-
 arch/arm/mach-orion5x/ls-chl-setup.c            |   4 +-
 arch/arm/mach-orion5x/ls_hgl-setup.c            |   4 +-
 arch/arm/mach-orion5x/lsmini-setup.c            |   4 +-
 arch/arm/mach-orion5x/mss2-setup.c              |   3 +-
 arch/arm/mach-orion5x/mv2120-setup.c            |   3 +-
 arch/arm/mach-orion5x/net2big-setup.c           |   4 +-
 arch/arm/mach-orion5x/pci.c                     |   7 +-
 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c    |   4 +-
 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c     |   4 +-
 arch/arm/mach-orion5x/rd88f5182-setup.c         |   7 +-
 arch/arm/mach-orion5x/terastation_pro2-setup.c  |   4 +-
 arch/arm/mach-orion5x/ts209-setup.c             |   4 +-
 arch/arm/mach-orion5x/ts409-setup.c             |   4 +-
 arch/arm/mach-orion5x/wnr854t-setup.c           |   4 +-
 arch/arm/mach-orion5x/wrt350n-v2-setup.c        |   4 +-
 arch/arm/plat-orion/Makefile                    |   6 -
 arch/arm/plat-orion/addr-map.c                  | 175 -------------------
 include/linux/mbus.h                            |   3 +
 60 files changed, 314 insertions(+), 880 deletions(-)
 create mode 100644 arch/arm/boot/dts/orion5x-88f5182.dtsi
 delete mode 100644 arch/arm/mach-dove/addr-map.c
 delete mode 100644 arch/arm/mach-kirkwood/addr-map.c
 delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c
 delete mode 100644 arch/arm/mach-mvebu/addr-map.c
 delete mode 100644 arch/arm/mach-orion5x/addr-map.c
 delete mode 100644 arch/arm/plat-orion/addr-map.c
Gregory CLEMENT - March 17, 2013, 10:26 p.m.
Hi Jason,

On 03/17/2013 09:15 PM, Jason Cooper wrote:
> The following changes since commit 207b6b8da3195dafe3e0d2143262640ddace74af:
> 
>   Merge branch 'mvebu/drivers' into mvebu/soc
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/soc_changes_for_v3.10
> 
> for you to fetch changes up to c135394ade12b00be1fdd04f68ff8470207a9b32:
> 
>   arm: plat-orion: remove addr-map code
> 
> ----------------------------------------------------------------
> mvebu soc changes for v3.10
>     
>      - use mvebu-mbus driver for:
>         - kirkwood
>         - dove
>         - orion5x
>         - mv78xx
>         - mvebu
>     
>      - depends
>         - tags/cleanup_for_v3.10 (mvebu/cleanup)
>         - tags/drivers_for_v3.10 (mvebu/drivers)
> ----------------------------------------------------------------
> Thomas Petazzoni (6):
>       arm: mach-mvebu: convert to use mvebu-mbus driver
>       arm: mach-kirkwood: convert to use mvebu-mbus driver
>       arm: mach-dove: convert to use mvebu-mbus driver
>       arm: mach-orion5x: convert to use mvebu-mbus driver
>       arm: mach-mv78xx0: convert to use the mvebu-mbus driver

Could you hold on this one?

I managed to test Thomas patch set for a mv78x00 based board on Friday,
and I found a small bug. Thomas has a fix for it and he plans to send
a V3 with this fix next week.

Thanks,

Gregory
Jason - March 18, 2013, 1:07 a.m.
On Sun, Mar 17, 2013 at 11:26:10PM +0100, Gregory CLEMENT wrote:
> I managed to test Thomas patch set for a mv78x00 based board on Friday,
> and I found a small bug. Thomas has a fix for it and he plans to send
> a V3 with this fix next week.

A reply to the V2 patch would have been appreciated.  The series has
been on lakml since Mar 6th, with no comments...

Please just send a new version of the mv78xx0 patch.  No need for a new
series.

thx,

Jason.
Thomas Petazzoni - March 18, 2013, 4:18 p.m.
Dear Jason Cooper,

On Sun, 17 Mar 2013 21:07:26 -0400, Jason Cooper wrote:
> On Sun, Mar 17, 2013 at 11:26:10PM +0100, Gregory CLEMENT wrote:
> > I managed to test Thomas patch set for a mv78x00 based board on Friday,
> > and I found a small bug. Thomas has a fix for it and he plans to send
> > a V3 with this fix next week.
> 
> A reply to the V2 patch would have been appreciated.  The series has
> been on lakml since Mar 6th, with no comments...

Gregory managed to test the series on Friday, 15th March, and I did a
quick fix on that day. I've been on WE on Saturday/Sunday, so please
excuse the delay.

> Please just send a new version of the mv78xx0 patch.  No need for a new
> series.

Seeing the discussion with Arnd, it seems like a new series will be
needed. Not because of mv78xx0, but because Arnd wants a non-DT driver.

Best regards,

Thomas
Arnd Bergmann - March 18, 2013, 8:50 p.m.
On Monday 18 March 2013, Thomas Petazzoni wrote:
> > Please just send a new version of the mv78xx0 patch.  No need for a new
> > series.
> 
> Seeing the discussion with Arnd, it seems like a new series will be
> needed. Not because of mv78xx0, but because Arnd wants a non-DT driver.

You could do the patch to remove the DT binding on top if that makes your
life easier, as long it's gone by the time of the merge window.

	Arnd