linux-toradex.git/arch/arm/mach-netx, branch v3.10.2

ARM: 7642/1: netx: bump IRQ offset to 64

2013-03-03T22:54:11+00:00

The Netx IRQs offset from zero, which is illegal, since Linux
IRQ 0 is NO_IRQ.

Acked-by: Sascha Hauer 
Reviewed-by: Jamie Iles 
Signed-off-by: Linus Walleij 
Signed-off-by: Russell King

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05T18:26:20+00:00

From Shawn Guo:
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
are unused on ARM architecure.  Samsung has some code setting up wdog
in arch_decomp_wdog().  But since CONFIG_S3C_BOOT_WATCHDOG is defined
nowhere, it will not run.  Otherwise, system can not boot at all when
wdog is set up but no one pats it.

* tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: samsung: remove unused arch_decomp_wdog() code
  ARM: remove unused arch_decomp_wdog()
  ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

Signed-off-by: Olof Johansson

Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup

2013-01-15T03:55:03+00:00

From Rob Herring:

Initial irqchip init infrastructure and GIC and VIC clean-ups

This creates irqchip initialization infrastructure from Thomas
Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips
and adapted to use the new infrastructure. All DT enabled platforms
using GIC and VIC are converted over to use the new irqchip_init.

* tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux:
  irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h
  ARM: picoxcell: use common irqchip_init function
  ARM: spear: use common irqchip_init function
  irqchip: Move ARM VIC to drivers/irqchip
  ARM: samsung: remove unused tick.h
  ARM: remove unneeded vic.h includes
  ARM: remove mach .handle_irq for VIC users
  ARM: VIC: set handle_arch_irq in VIC initialization
  ARM: VIC: shrink down vic.h
  irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h
  ARM: use common irqchip_init for GIC init
  irqchip: Move ARM GIC to drivers/irqchip
  ARM: remove mach .handle_irq for GIC users
  ARM: GIC: set handle_arch_irq in GIC initialization
  ARM: GIC: remove direct use of gic_raise_softirq
  ARM: GIC: remove assembly ifdefs from gic.h
  ARM: mach-ux500: use SGI0 to wake up the other core
  arm: add set_handle_irq() to register the parent IRQ controller handler function
  irqchip: add basic infrastructure
  irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS

Fixed up massive merge conflicts with the timer cleanup due to adjacent changes:

Signed-off-by: Olof Johansson 

Conflicts:
	arch/arm/mach-bcm/board_bcm.c
	arch/arm/mach-cns3xxx/cns3420vb.c
	arch/arm/mach-ep93xx/adssphere.c
	arch/arm/mach-ep93xx/edb93xx.c
	arch/arm/mach-ep93xx/gesbc9312.c
	arch/arm/mach-ep93xx/micro9.c
	arch/arm/mach-ep93xx/simone.c
	arch/arm/mach-ep93xx/snappercl15.c
	arch/arm/mach-ep93xx/ts72xx.c
	arch/arm/mach-ep93xx/vision_ep9307.c
	arch/arm/mach-highbank/highbank.c
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-msm/board-dt-8960.c
	arch/arm/mach-netx/nxdb500.c
	arch/arm/mach-netx/nxdkn.c
	arch/arm/mach-netx/nxeb500hmi.c
	arch/arm/mach-nomadik/board-nhk8815.c
	arch/arm/mach-picoxcell/common.c
	arch/arm/mach-realview/realview_eb.c
	arch/arm/mach-realview/realview_pb1176.c
	arch/arm/mach-realview/realview_pb11mp.c
	arch/arm/mach-realview/realview_pba8.c
	arch/arm/mach-realview/realview_pbx.c
	arch/arm/mach-socfpga/socfpga.c
	arch/arm/mach-spear13xx/spear1310.c
	arch/arm/mach-spear13xx/spear1340.c
	arch/arm/mach-spear13xx/spear13xx.c
	arch/arm/mach-spear3xx/spear300.c
	arch/arm/mach-spear3xx/spear310.c
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear3xx/spear3xx.c
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/board-dt-tegra30.c
	arch/arm/mach-u300/core.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/cpu-db8500.c
	arch/arm/mach-versatile/versatile_ab.c
	arch/arm/mach-versatile/versatile_dt.c
	arch/arm/mach-versatile/versatile_pb.c
	arch/arm/mach-vexpress/v2m.c
	include/asm-generic/vmlinux.lds.h

Merge branch 'clocksource/cleanup' into next/cleanup

2013-01-14T18:20:02+00:00

Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson 

Conflicts:
	arch/arm/mach-pxa/time.c

ARM: use clockevents_config_and_register() where possible

2013-01-14T18:12:42+00:00

The clockevent core is able to figure out the best mult and shift,
calculate min_delta_ns and max_delta_ns, with the necessary info passed
into clockevents_config_and_register().  Use this combined configure
and register function where possible to make the codes less error prone
and gain some positive diff stat.

Signed-off-by: Shawn Guo 
Cc: Nicolas Ferre 
Reviewed-by: Anton Vorontsov 
Acked-by: Kukjin Kim 
Cc: Russell King 
Cc: Sascha Hauer 
Cc: Jason Cooper 
Tested-by: Roland Stigge 
Acked-by: Eric Miao 
Cc: Haojian Zhuang 
Cc: David Brown 
Tested-by: Tony Lindgren 
Acked-by: Barry Song 
Tested-by: Stephen Warren 
Acked-by: Tony Prisk 
Cc: Lennert Buytenhek 
Cc: Wan ZongShun 
Acked-by: Viresh Kumar 
Acked-by: Arnd Bergmann 
Acked-by: Jason Cooper 
Reviewed-by: Thomas Gleixner 
Signed-off-by: Olof Johansson

irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h

2013-01-12T16:52:16+00:00

Now that we have VIC moved to drivers/irqchip and all VIC DT init for
platforms using irqchip_init, move gic.h and update the remaining
includes.

Signed-off-by: Rob Herring 
Cc: Thomas Gleixner 
Cc: Hartley Sweeten 
Cc: Ryan Mallon 
Cc: Russell King 
Cc: Alessandro Rubini 
Acked-by: Linus Walleij 
Cc: STEricsson 
Cc: Ben Dooks 
Cc: Kukjin Kim 
Cc: linux-samsung-soc@vger.kernel.org

ARM: remove unneeded vic.h includes

2013-01-12T16:51:59+00:00

Numerous includes of asm/hardware/vic.h aren't needed, so remove them.

Signed-off-by: Rob Herring 
Acked-by: H Hartley Sweeten 
Cc: Ryan Mallon 
Cc: Russell King 
Cc: Hubert Feurstein 
Cc: Alessandro Rubini 
Acked-by: Linus Walleij 
Cc: STEricsson 
Cc: Ben Dooks 
Cc: Kukjin Kim 
Acked-by: Mark Brown 
Cc: Kyungmin Park 
Acked-By: Maxime Ripard 
Cc: linux-samsung-soc@vger.kernel.org
Cc: patches@opensource.wolfsonmicro.com
Acked-by: Arnd Bergmann

ARM: remove mach .handle_irq for VIC users

2013-01-12T16:48:04+00:00

Now that the VIC initialization sets up the handle_arch_irq pointer, we
can remove it for all machines and make it static. Move vic_handle_irq
to avoid a forward declaration.

Signed-off-by: Rob Herring 
Cc: Ryan Mallon 
Cc: Russell King 
Cc: Hubert Feurstein 
Cc: Alessandro Rubini 
Cc: STEricsson 
Cc: Ben Dooks 
Cc: Kyungmin Park 
Cc: Shiraz Hashim 
Cc: Rajeev Kumar 
Acked-by: H Hartley Sweeten 
Acked-by: Jamie Iles 
Acked-by: Linus Walleij 
Acked-by: Mark Brown 
Acked-by: Viresh Kumar 
Acked-by: Kukjin Kim 
Acked-by: Olof Johansson 
Acked-by: Arnd Bergmann

ARM: remove unused arch_decomp_wdog()

2013-01-11T02:54:03+00:00

With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
all the arch_decomp_wdog() definition at platform level is unneeded.
Remmove it.

Signed-off-by: Shawn Guo 
Acked-by: Nicolas Pitre 
Acked-by: Jason Cooper

ARM: delete struct sys_timer

2012-12-24T16:36:38+00:00

Now that the only field in struct sys_timer is .init, delete the struct,
and replace the machine descriptor .timer field with the initialization
function itself.

This will enable moving timer drivers into drivers/clocksource without
having to place a public prototype of each struct sys_timer object into
include/linux; the intent is to create a single of_clocksource_init()
function that determines which timer driver to initialize by scanning
the device dtree, much like the proposed irqchip_init() at:
http://www.spinics.net/lists/arm-kernel/msg203686.html

Includes mach-omap2 fixes from Igor Grinberg.

Tested-by: Robert Jarzmik 
Signed-off-by: Stephen Warren