linux-toradex.git/arch/arm/mach-integrator/include/mach, branch v3.4.67

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30T01:02:10+00:00

Pull "ARM: cleanups of io includes" from Olof Johansson:
 "Rob Herring has done a sweeping change cleaning up all of the
  mach/io.h includes, moving some of the oft-repeated macros to a common
  location and removing a bunch of boiler plate.  This is another step
  closer to a common zImage for multiple platforms."

Fix up various fairly trivial conflicts ( removal vs changes
around it, tegra localtimer.o is *still* gone, yadda-yadda).

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: tegra: Include assembler.h in sleep.S to fix build break
  ARM: pxa: use common IOMEM definition
  ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
  ARM: __io abuse cleanup
  ARM: create a common IOMEM definition
  ARM: iop13xx: fix missing declaration of iop13xx_init_early
  ARM: fix ioremap/iounmap for !CONFIG_MMU
  ARM: kill off __mem_pci
  ARM: remove bunch of now unused mach/io.h files
  ARM: make mach/io.h include optional
  ARM: clps711x: remove unneeded include of mach/io.h
  ARM: dove: add explicit include of dove.h to addr-map.c
  ARM: at91: add explicit include of hardware.h to uncompressor
  ARM: ep93xx: clean-up mach/io.h
  ARM: tegra: clean-up mach/io.h
  ARM: orion5x: clean-up mach/io.h
  ARM: davinci: remove unneeded mach/io.h include
  [media] davinci: remove includes of mach/io.h
  ARM: OMAP: Remove remaining includes for mach/io.h
  ARM: msm: clean-up mach/io.h
  ...

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29T23:53:48+00:00

Pull more ARM updates from Russell King.

This got a fair number of conflicts with the  split, but
also with some other sparse-irq and header file include cleanups.  They
all looked pretty trivial, though.

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits)
  ARM: fix Kconfig warning for HAVE_BPF_JIT
  ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds
  ARM: 7349/1: integrator: convert to sparse irqs
  ARM: 7259/3: net: JIT compiler for packet filters
  ARM: 7334/1: add jump label support
  ARM: 7333/2: jump label: detect %c support for ARM
  ARM: 7338/1: add support for early console output via semihosting
  ARM: use set_current_blocked() and block_sigmask()
  ARM: exec: remove redundant set_fs(USER_DS)
  ARM: 7332/1: extract out code patch function from kprobes
  ARM: 7331/1: extract out insn generation code from ftrace
  ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format
  ARM: 7351/1: ftrace: remove useless memory checks
  ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path
  ARM: Versatile Express: add NO_IOPORT
  ARM: get rid of asm/irq.h in asm/prom.h
  ARM: 7319/1: Print debug info for SIGBUS in user faults
  ARM: 7318/1: gic: refactor irq_start assignment
  ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop
  ARM: 7315/1: perf: add support for the Cortex-A7 PMU
  ...

Merge branch 'devel-stable' into for-linus

2012-03-27T10:30:31+00:00

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/plat-versatile/Kconfig
Merge fixes:
	arch/arm/mach-integrator/Kconfig
	drivers/clocksource/Kconfig

ARM: 7349/1: integrator: convert to sparse irqs

2012-03-24T09:38:56+00:00

This converts the Integrator AP/CP to use sparse IRQs.
Tested on both machines.

Acked-by: Rob Herring 
Signed-off-by: Linus Walleij 
Signed-off-by: Russell King

ARM: kill off __mem_pci

2012-03-07T03:34:45+00:00

__mem_pci is only used to enable readl/writel and friends. Just condition
this on readl being defined and remove all the __mem_pci defines.

Signed-off-by: Rob Herring 
Cc: Russell King 
Cc: Lennert Buytenhek 
Cc: Imre Kaloz 
Cc: Krzysztof Halasa 
Cc: Nicolas Pitre 
Cc: Ben Dooks 
Cc: Kukjin Kim 
Cc: Colin Cross 
Cc: Olof Johansson 
Cc: Stephen Warren

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22T22:04:41+00:00

ARM: remove disable_fiq and arch_ret_to_user macros

2012-02-21T23:05:18+00:00

Now that most platforms don't need disable_fiq and arch_ret_to_user
macros, we can remove the empty macros or empty entry-macro.S files.

Signed-off-by: Rob Herring 
Acked-by: Jamie Iles 
Acked-by: Nicolas Pitre 
Acked-by: Tony Lindgren 
Acked-by: Linus Walleij 
Acked-by: Ryan Mallon 
Acked-by: Nicolas Ferre 
Acked-by: H Hartley Sweeten 
Acked-by: Shawn Guo

ARM: big removal of now unused arch_idle()

2012-01-21T00:25:58+00:00

When this is the only content remaining in mach/system.h then the
whole file is removed.

Signed-off-by: Nicolas Pitre 
Acked-by: H Hartley Sweeten 
Acked-and-tested-by: Jamie Iles 
Acked-by: Tony Lindgren 
Acked-by: David Brown 
Acked-by: Stephen Warren 
Acked-by: Linus Walleij

Merge branch 'restart' into for-linus

2012-01-05T13:25:27+00:00

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.

ARM: restart: remove the now empty arch_reset()

2012-01-05T12:57:22+00:00

Remove the now empty arch_reset() from all the mach/system.h includes,
and remove its callsite.  Remove arm_machine_restart() as this function
no longer does anything useful.

For samsung platforms, remove the include of mach/system-reset.h and
plat/system-reset.h from their respective mach/system.h headers as these
just define their arch_reset functions.  As a result, the s3c2410 and
plat-samsung system-reset.h files are no longer referenced, so remove
these files entirely.

Acked-by: Nicolas Pitre 
Acked-by: H Hartley Sweeten 
Acked-by: Jamie Iles 
Acked-by: Tony Lindgren 
Acked-by: Linus Walleij 
Signed-off-by: Russell King