Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
b014487044
linux/arch/arm/mach-orion5x
History
Olof Johansson 0d601f613b Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 
* '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>
2012-09-22 14:22:47 -07:00
..
include/mach Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
addr-map.c arm: plat-orion: use void __iomem pointers for addr-map functions 2012-09-21 18:04:47 +00:00
common.c Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
common.h Orion5x: Fix warning: struct pci_dev declared inside paramter list 2012-05-14 18:12:36 +02:00
d2net-setup.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
db88f5281-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
dns323-setup.c Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
edmini_v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
irq.c Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
Kconfig ARM: orion5x: remove PM dependency from ts78xx 2012-05-14 18:13:03 +02:00
kurobox_pro-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
ls_hgl-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
ls-chl-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
lsmini-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
Makefile [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c arm: plat-orion: use void __iomem pointers for MPP functions 2012-09-21 18:04:24 +00:00
mpp.h ARM: orion5x: Fix GPIO enable bits for MPP9 2012-05-08 18:57:21 +00:00
mss2-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
mv2120-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
net2big-setup.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
pci.c Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
rd88f5181l-fxo-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
rd88f5181l-ge-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
rd88f5182-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
rd88f6183ap-ge-setup.c arm-soc: clock driver changes 2012-05-26 12:42:29 -07:00
terastation_pro2-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
ts78xx-fpga.h ARM: orion5x: ts78xx whitespace cleanups 2012-05-14 18:13:00 +02:00
ts78xx-setup.c - More robust parsing especially of xattr data in JFFS2 2012-06-01 16:55:42 -07:00
ts209-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
ts409-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
tsx09-common.c ARM: orion5x: clean-up mach/io.h 2012-03-06 21:34:40 -06:00
tsx09-common.h
wnr854t-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
wrt350n-v2-setup.c ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00