android_kernel_motorola_sm6225/arch/arm/mach-shmobile
Arnd Bergmann 797b3a9ee7 Merge branch 'gic/cleanup' into next/soc2
Both zynq and shmobile have conflicts against the gic cleanup
series, resolved here.

Conflicts:
	arch/arm/mach-shmobile/smp-emev2.c
	arch/arm/mach-shmobile/smp-r8a7779.c
	arch/arm/mach-shmobile/smp-sh73a0.c
	arch/arm/mach-zynq/platsmp.c
	drivers/gpio/gpio-pl061.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-04-08 18:59:19 +02:00
..
include/mach ARM: shmobile: r8a73a4: Remove all GPIO enums 2013-04-03 10:30:43 +09:00
board-ag5evm.c ARM: shmobile: ag5evm: Register pinctrl mappings for IrDA 2013-03-15 13:34:09 +01:00
board-ap4evb.c ARM: shmobile: ap4evb: Register pinctrl mappings for SDHI and MMCIF 2013-03-15 13:34:09 +01:00
board-armadillo800eva.c Merge branch 'soc' into pinmux-base 2013-04-02 11:08:34 +09:00
board-bonito.c ARM: shmobile: bonito: Register pinctrl mappings for LCDC0 2013-03-15 13:34:10 +01:00
board-kota2.c ARM: shmobile: kota2: Register pinctrl mappings for BSC 2013-03-15 13:34:10 +01:00
board-kzm9d.c Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
board-kzm9g.c Merge branch 'soc' into pinmux-base 2013-04-02 11:08:34 +09:00
board-mackerel.c ARM: shmobile: mackerel: Register pinctrl mappings for SDHI and MMCIF 2013-03-15 13:34:12 +01:00
board-marzen.c ARM: shmobile: marzen: Add GPIO LEDs 2013-04-03 10:30:34 +09:00
clock-emev2.c mach-shmobile: Emma Mobile EV2 DT support V3 2012-05-18 00:14:03 +02:00
clock-r8a73a4.c ARM: shmobile: r8a73a4: add thermal driver support 2013-04-02 10:58:25 +09:00
clock-r8a7740.c ARM: shmobile: r8a7740: use fixed ratio clock 2013-04-02 11:02:17 +09:00
clock-r8a7778.c ARM: shmobile: r8a7778 SCIF support 2013-04-02 10:58:24 +09:00
clock-r8a7779.c ARM: shmobile: r8a7779: remove DIV4 clocks and use fixed ratio clock 2013-04-02 11:02:18 +09:00
clock-r8a7790.c ARM: shmobile: r8a7790 SCIF support 2013-04-02 11:02:20 +09:00
clock-sh73a0.c ARM: shmobile: sh73a0: use fixed ratio clock 2013-04-02 11:02:17 +09:00
clock-sh7372.c ARM: shmobile: sh7372: use fixed ratio clock 2013-04-02 11:02:16 +09:00
clock.c ARM: shmobile: add struct clk_ratio and fixed ratio clock macro 2013-04-02 11:02:16 +09:00
console.c
cpuidle.c ARM: shmobile: Make sh7372 cpuidle handling more straightforward 2012-09-04 01:45:01 +02:00
entry-intc.S
headsmp-scu.S ARM: shmobile: Fix base address readout in headsmp-scu.S 2013-03-13 02:13:20 +09:00
headsmp.S arm: Add v7_invalidate_l1 to cache-v7.S 2013-02-11 19:37:24 -08:00
intc-r8a7740.c ARM: shmobile: r8a7740: Migrate from INTC to GIC 2013-04-02 11:02:09 +09:00
intc-r8a7779.c ARM: shmobile: Make r8a7779 INTC irqpin platform data static 2013-03-18 21:26:06 +09:00
intc-sh73a0.c ARM: shmobile: INTC External IRQ pin driver on sh73a0 2013-03-18 21:26:05 +09:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
Kconfig ARM: shmobile: r8a7790 PFC support 2013-04-02 11:02:20 +09:00
Makefile ARM: shmobile: Initial r8a7790 SoC support 2013-04-02 11:02:19 +09:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
platsmp.c ARM: remove mach .handle_irq for GIC users 2013-01-12 10:47:20 -06:00
pm-r8a7740.c ARM: shmobile: r8a7740: Add CPU sleep suspend 2013-01-25 12:43:46 +09:00
pm-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
pm-rmobile.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
pm-sh73a0.c ARM: shmobile: sh73a0: Add CPU sleep suspend 2013-01-25 12:43:46 +09:00
pm-sh7372.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
setup-emev2.c ARM: shmobile: Make EMEV2 setup functions static 2013-03-13 02:13:19 +09:00
setup-r8a73a4.c ARM: shmobile: r8a73a4: add thermal driver support 2013-04-02 10:58:25 +09:00
setup-r8a7740.c ARM: shmobile: r8a7740: Migrate from INTC to GIC 2013-04-02 11:02:09 +09:00
setup-r8a7778.c ARM: shmobile: r8a7778 SCIF support 2013-04-02 10:58:24 +09:00
setup-r8a7779.c ARM: shmobile: r8a7779: Register GPIO devices 2013-04-03 10:30:37 +09:00
setup-r8a7790.c ARM: shmobile: r8a7790 PFC support 2013-04-02 11:02:20 +09:00
setup-sh73a0.c ARM: shmobile: Make sh73a0 INTC irqpin platform data static 2013-03-18 21:26:06 +09:00
setup-sh7372.c IOMMU Updates for Linux v3.9 2013-02-26 11:09:17 -08:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S ARM: sh7372: fix cache clean / invalidate order 2013-01-25 12:43:45 +09:00
smp-emev2.c Merge branch 'gic/cleanup' into next/soc2 2013-04-08 18:59:19 +02:00
smp-r8a7779.c Merge branch 'gic/cleanup' into next/soc2 2013-04-08 18:59:19 +02:00
smp-sh73a0.c Merge branch 'gic/cleanup' into next/soc2 2013-04-08 18:59:19 +02:00
suspend.c
timer.c ARM: shmobile: Register ARM architected timer 2013-02-05 17:13:55 +09:00