kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-02 19:05:42 +00:00
Code Issues Releases Packages Activity

Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood

Browse source 
* 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: add address decoding controller to the DT
  arm: mvebu: add basic address decoding support to Armada 370/XP
  arm: plat-orion: make bridge_virt_base non-const to support DT use case
  arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
  arm: plat-orion: use void __iomem pointers for addr-map functions
  arm: plat-orion: use void __iomem pointers for time functions
  arm: plat-orion: use void __iomem pointers for MPP functions
  arm: plat-orion: use void __iomem pointers for UART registration functions
  arm: mach-mvebu: use IOMEM() for base address definitions
  arm: mach-orion5x: use IOMEM() for base address definitions
  arm: mach-mv78xx0: use IOMEM() for base address definitions
  arm: mach-kirkwood: use IOMEM() for base address definitions
  arm: mach-dove: use IOMEM() for base address definitions
  arm: mach-orion5x: use plus instead of or for address definitions
  arm: mach-mv78xx0: use plus instead of or for address definitions
  arm: mach-kirkwood: use plus instead of or for address definitions
  arm: mach-dove: use plus instead of or for address definitions

This branch had quite a few conflicts, in particular with the PCI static
map rework from Rob Herring, and a few other context conflicts due to
changes in Kconfig, etc.

I fixed up conflicts in:
	arch/arm/Kconfig
	arch/arm/mach-dove/common.c
	arch/arm/mach-dove/include/mach/dove.h
	arch/arm/mach-kirkwood/common.c
	arch/arm/mach-kirkwood/include/mach/kirkwood.h
	arch/arm/mach-mv78xx0/common.c
	arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
	arch/arm/mach-orion5x/common.c
	arch/arm/mach-orion5x/include/mach/orion5x.h

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-09-22 14:09:21 -07:00
commit 0d601f613b
40 changed files with 459 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/Kconfig
View file

5
arch/arm/boot/dts/armada-370-xp.dtsi
View file

4
arch/arm/mach-dove/common.c
View file

16
arch/arm/mach-dove/include/mach/bridge-regs.h
View file

126
arch/arm/mach-dove/include/mach/dove.h
View file

10
arch/arm/mach-dove/irq.c
View file

6
arch/arm/mach-dove/pcie.c
View file

3
arch/arm/mach-kirkwood/addr-map.c
View file

8
arch/arm/mach-kirkwood/common.c
View file

20
arch/arm/mach-kirkwood/include/mach/bridge-regs.h
View file

92
arch/arm/mach-kirkwood/include/mach/kirkwood.h
View file

9
arch/arm/mach-kirkwood/irq.c
View file

12
arch/arm/mach-kirkwood/pcie.c
View file

3
arch/arm/mach-kirkwood/ts41x-setup.c
View file

6
arch/arm/mach-mv78xx0/addr-map.c
View file

4
arch/arm/mach-mv78xx0/common.c
View file

12
arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
View file

72
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
View file

9
arch/arm/mach-mv78xx0/irq.c
View file

12
arch/arm/mach-mv78xx0/pcie.c
View file

2
arch/arm/mach-mvebu/Makefile
View file

134
arch/arm/mach-mvebu/addr-map.c
View file

2
arch/arm/mach-mvebu/armada-370-xp.c
View file

2
arch/arm/mach-mvebu/armada-370-xp.h
View file

3
arch/arm/mach-orion5x/addr-map.c
View file

4
arch/arm/mach-orion5x/common.c
View file

2
arch/arm/mach-orion5x/dns323-setup.c
View file

20
arch/arm/mach-orion5x/include/mach/bridge-regs.h
View file

56
arch/arm/mach-orion5x/include/mach/orion5x.h
View file

5
arch/arm/mach-orion5x/irq.c
View file

6
arch/arm/mach-orion5x/pci.c
View file

9
arch/arm/plat-orion/Makefile
View file

11
arch/arm/plat-orion/addr-map.c
View file

12
arch/arm/plat-orion/common.c
View file

4
arch/arm/plat-orion/include/plat/addr-map.h
View file

8
arch/arm/plat-orion/include/plat/common.h
View file

2
arch/arm/plat-orion/include/plat/mpp.h
View file

4
arch/arm/plat-orion/include/plat/time.h
View file

6
arch/arm/plat-orion/mpp.c
View file

8
arch/arm/plat-orion/time.c
View file