Patchwork [GIT,PULL] arm-soc: Xilinx zynq multiplatform changes for v3.8

login
register
mail settings
Submitter Michal Simek
Date Nov. 21, 2012, 3:51 p.m.
Message ID <CAHTX3d+bqMnsWxQp3GAmprSDzNB18otT3SrPi5MkA+d8006Aww@mail.gmail.com>
Download mbox
Permalink /patch/200795/
State New
Headers show

Pull-request

git://git.monstr.eu/linux-2.6-microblaze.git zynq/multiplatform

Comments

Michal Simek - Nov. 21, 2012, 3:51 p.m.
Hi Olof and Arnd,

based on my chat with Olof today I have created new branch
with 4 patches which move zynq to multiplatform.

This branch depends on arm-soc devel/debug_ll_init branch because
we needed Rob's "ARM: implement debug_ll_io_init()"
(sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
patch.

This branch also depends on zynq/dt branch because of previous major
zynq changes.
zynq/cleanup branch is subset of zynq/dt.

That's why I have merged devel/debug_ll_init branch with zynq/dt and
add 4 patches
on the top of it.

Please let me know if there is necessary to clean something.

Thanks,
Michal

P.S.: I had to use different server because git.xilinx.com is down right now.


The following changes since commit 84d2e38e935620004245f0e22113cf8389834635:
  Michal Simek (1):
        Merge branch 'devel/debug_ll_init' into zynq/multiplatform

are available in the git repository at:

  git://git.monstr.eu/linux-2.6-microblaze.git zynq/multiplatform

Josh Cartwright (3):
      ARM: zynq: remove TTC early mapping
      ARM: zynq: make use of debug_ll_io_init()
      ARM: zynq: add support for ARCH_MULTIPLATFORM

Michal Simek (1):
      ARM: zynq: Remove all unused mach headers

 arch/arm/Kconfig                                   |   14 +-----
 arch/arm/Kconfig.debug                             |    1 +
 .../mach/debug-macro.S => include/debug/zynq.S}    |   23 +++++++--
 arch/arm/mach-zynq/Kconfig                         |   13 +++++
 arch/arm/mach-zynq/common.c                        |   38 ++++----------
 arch/arm/mach-zynq/include/mach/hardware.h         |   18 -------
 arch/arm/mach-zynq/include/mach/irqs.h             |   21 --------
 arch/arm/mach-zynq/include/mach/timex.h            |   23 ---------
 arch/arm/mach-zynq/include/mach/uart.h             |   25 ---------
 arch/arm/mach-zynq/include/mach/uncompress.h       |   51 -------------------
 arch/arm/mach-zynq/include/mach/zynq_soc.h         |   53 --------------------
 arch/arm/mach-zynq/timer.c                         |    1 -
 12 files changed, 46 insertions(+), 235 deletions(-)
 rename arch/arm/{mach-zynq/include/mach/debug-macro.S =>
include/debug/zynq.S} (61%)
 create mode 100644 arch/arm/mach-zynq/Kconfig
 delete mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-zynq/include/mach/timex.h
 delete mode 100644 arch/arm/mach-zynq/include/mach/uart.h
 delete mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
Olof Johansson - Nov. 21, 2012, 8:01 p.m.
Hi,

On Wed, Nov 21, 2012 at 04:51:07PM +0100, Michal Simek wrote:
> Hi Olof and Arnd,
> 
> based on my chat with Olof today I have created new branch
> with 4 patches which move zynq to multiplatform.
> 
> This branch depends on arm-soc devel/debug_ll_init branch because
> we needed Rob's "ARM: implement debug_ll_io_init()"
> (sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
> patch.
> 
> This branch also depends on zynq/dt branch because of previous major
> zynq changes.
> zynq/cleanup branch is subset of zynq/dt.
> 
> That's why I have merged devel/debug_ll_init branch with zynq/dt and
> add 4 patches
> on the top of it.

Nice work.

This looks quite reasonable, is small and self-contained and doesn't really
affect anyone outside of zynq. So I've pulled into next/multiplatform for 3.8.

As part of this, the next/* branches have been somewhat reordered, since
multiplatform now includes next/dt contents I've moved it down below there. It
shouldn't affect much since no other branch pulls in next/multiplatform
contents.


-Olof
Michal Simek - Nov. 22, 2012, 7:05 a.m.
Hi,

2012/11/21 Olof Johansson <olof@lixom.net>:
> Hi,
>
> On Wed, Nov 21, 2012 at 04:51:07PM +0100, Michal Simek wrote:
>> Hi Olof and Arnd,
>>
>> based on my chat with Olof today I have created new branch
>> with 4 patches which move zynq to multiplatform.
>>
>> This branch depends on arm-soc devel/debug_ll_init branch because
>> we needed Rob's "ARM: implement debug_ll_io_init()"
>> (sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
>> patch.
>>
>> This branch also depends on zynq/dt branch because of previous major
>> zynq changes.
>> zynq/cleanup branch is subset of zynq/dt.
>>
>> That's why I have merged devel/debug_ll_init branch with zynq/dt and
>> add 4 patches
>> on the top of it.
>
> Nice work.
>
> This looks quite reasonable, is small and self-contained and doesn't really
> affect anyone outside of zynq. So I've pulled into next/multiplatform for 3.8.
>
> As part of this, the next/* branches have been somewhat reordered, since
> multiplatform now includes next/dt contents I've moved it down below there. It
> shouldn't affect much since no other branch pulls in next/multiplatform
> contents.

Thanks a lot,
Michal