1
0
Fork 0
alistair23-linux/arch/arm
Olof Johansson 5ae8d15f68 Enable initial ARM multi-platform support for highbank, mvebu,
socfpga, picoxcell, and vexpress.
 
 Multi-platform support is dependent on mach/gpio.h removal and
 restructuring of DEBUG_LL and dtb build rules included in this branch.
 
 This has been built for all defconfigs, and booted on highbank with
 all 5 platforms enabled.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQU4miAAoJEMhvYp4jgsXi1vMH/A4JJXe24cyo31rHJspZDSFg
 nnCbnGKfDEOIHwLA8C3OeJuhswMlP/vWlGC512QXL8903XpZ2VJe63f2CLo1mN7Z
 hg3JPWrp2VXZ/bqdMnUcw2CtlylrhyG9MUPapkcp+5Agjz2lwaJtRNL6LRRQX4Ei
 cWjsJtaFpRj1QraFna0hpTQNO640je6s1rAIJl6eNOuX08l12ZAGDUA+IUUsa1cA
 0OGeOAjH6gmkpMI89j1VPPKVRLHIdP4QcxmAZCHJ2LtvylyrlmYskctpAYibobvt
 JPLnZgzMFAegnWtJhOYodhBJlfyypEeh2fsZVyDPowqRz9vaAWRjs6u/I4GYaME=
 =HR3H
 -----END PGP SIGNATURE-----

Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform

Enable initial ARM multi-platform support for highbank, mvebu,
socfpga, picoxcell, and vexpress.

Multi-platform support is dependent on mach/gpio.h removal and
restructuring of DEBUG_LL and dtb build rules included in this branch.

This has been built for all defconfigs, and booted on highbank with
all 5 platforms enabled.

By Rob Herring (18) and Arnd Bergmann (1)
via Rob Herring
* tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux:
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ARM: orion: move custom gpio functions to orion-gpio.h
  ARM: shmobile: move custom gpio functions to sh-gpio.h
  ARM: pxa: use gpio_to_irq for sharppm_sl
  net: pxaficp_ir: add irq resources
  usb: pxa27x_udc: remove IRQ_USB define
  staging: ste_rmi4: remove gpio.h include

Conflicts due to addition of bcm2835 and removal of pnx4008 in:
	arch/arm/Kconfig
	arch/arm/Makefile

Conflicts due to new dtb targets, moved to arch/arm/boot/dts/Makefile in:
	arch/arm/mach-imx/Makefile.boot
	arch/arm/mach-mxs/Makefile.boot
	arch/arm/mach-tegra/Makefile.boot

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-20 22:54:07 -07:00
..
boot Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
common ARM: dma-mapping: add support for dma_get_sgtable() 2012-07-30 12:25:47 +02:00
configs Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
include Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
kernel Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
lib ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop 2012-09-09 17:28:48 +01:00
mach-at91 Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-bcm2835 ARM: bcm2835: add stub clock driver 2012-09-19 19:08:53 -06:00
mach-bcmring Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
mach-clps711x ARM: clps711x: Remove the setting of the time 2012-07-17 22:24:30 +02:00
mach-cns3xxx
mach-davinci ARM: davinci: remove broken ntosd2_init_i2c 2012-08-10 13:14:36 +02:00
mach-dove Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-ebsa110
mach-ep93xx ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
mach-exynos Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-footbridge ARM: footbridge: use fixed PCI i/o mapping 2012-07-26 09:09:59 -05:00
mach-gemini ARM: gemini: fix the gemini build 2012-09-04 22:17:34 -07:00
mach-h720x
mach-highbank ARM: initial multiplatform support 2012-09-14 09:22:06 -05:00
mach-imx Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-integrator Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci 2012-09-04 15:01:37 +02:00
mach-iop13xx ARM: iop13xx: use fixed PCI i/o mapping 2012-07-26 09:10:02 -05:00
mach-iop32x ARM: iop3xx: use fixed PCI i/o mapping 2012-07-26 09:10:04 -05:00
mach-iop33x ARM: iop3xx: use fixed PCI i/o mapping 2012-07-26 09:10:04 -05:00
mach-ixp4xx ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
mach-kirkwood Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-ks8695 ARM: ks8695: convert to generic time and clocksource 2012-09-05 08:49:22 +02:00
mach-l7200/include/mach
mach-lpc32xx Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-mmp Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-msm Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-mv78xx0 Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-mvebu ARM: initial multiplatform support 2012-09-14 09:22:06 -05:00
mach-mxs Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-netx arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n 2012-07-30 17:25:13 -07:00
mach-nomadik ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
mach-omap1 ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
mach-omap2 Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-orion5x Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-picoxcell ARM: initial multiplatform support 2012-09-14 09:22:06 -05:00
mach-prima2 Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-pxa Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-realview Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-rpc ARM: fiq: change FIQ_START to a variable 2012-07-01 21:59:19 +08:00
mach-s3c24xx Merge branch 'samsung/cleanup' into next/cleanup 2012-09-20 16:35:21 -07:00
mach-s3c64xx ARM: arm-soc soc updates, take 2 2012-07-30 09:45:53 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 arm-soc: device tree description updates 2012-07-23 16:17:43 -07:00
mach-s5pc100 arm-soc: device tree description updates 2012-07-23 16:17:43 -07:00
mach-s5pv210 arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
mach-sa1100 ARM: sa1100: include linux/io.h in hackkit leds code 2012-08-09 15:16:42 +02:00
mach-shark ARM: shark: use fixed PCI i/o mapping 2012-07-26 09:09:58 -05:00
mach-shmobile Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-socfpga ARM: initial multiplatform support 2012-09-14 09:22:06 -05:00
mach-spear3xx ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
mach-spear6xx ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
mach-spear13xx ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
mach-tegra Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-u300 Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-ux500 Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-versatile Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-vexpress Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
mach-vt8500 ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
mach-w90x900
mach-zynq
mm Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
net ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support 2012-06-14 15:12:13 +01:00
nwfpe
oprofile ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration 2012-07-09 17:41:10 +01:00
plat-iop Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
plat-mxc Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
plat-nomadik i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h> 2012-07-09 11:40:40 +02:00
plat-omap Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
plat-orion ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
plat-pxa Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
plat-s3c24xx ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters 2012-08-08 09:04:51 +09:00
plat-samsung Merge branch 'samsung/cleanup' into next/cleanup 2012-09-20 16:35:21 -07:00
plat-spear ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
plat-versatile ARM: vexpress: convert to multi-platform 2012-09-14 12:55:09 -05:00
tools ARM: mach-pnx4008: Remove architecture 2012-08-26 16:30:37 +02:00
vfp ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled 2012-08-11 09:15:57 +01:00
Kconfig Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
Kconfig-nommu
Kconfig.debug Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00
Makefile Enable initial ARM multi-platform support for highbank, mvebu, 2012-09-20 22:54:07 -07:00