Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 03:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
ae8b378fae
linux/arch/arm/mach-shmobile
History
Simon Horman ae8b378fae Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base 
This branch acts as a base for adding USB support to
r8A7778/BOCK-W and r8A7779/Marzen.

It includes the soc branch to provide dependencies in
the r8A7778 clock code.

It includes pinmux to provide pinmux initialisation for Bock-W
which is a dependency.

Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/include/mach/r8a7778.h
	arch/arm/mach-shmobile/setup-r8a7778.c
2013-06-11 14:58:57 +09:00
..
include/mach Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base 2013-06-11 14:58:57 +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 mapping for USBHS 2013-06-04 21:04:20 +09:00
board-ape6evm.c ARM: shmobile: APE6EVM LAN9220 support 2013-04-03 10:50:43 +09:00
board-armadillo800eva.c ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl 2013-06-05 17:16:44 +09:00
board-bockw.c ARM: shmobile: bockw: add pinctrl support 2013-06-05 17:18:23 +09:00
board-bonito.c ARM: shmobile: bonito: Don't configure LCDC routing manually 2013-06-04 21:04:31 +09:00
board-kota2.c ARM: shmobile: kota2: Register pinctrl mappings for BSC 2013-03-15 13:34:10 +01:00
board-kzm9d.c ARM: convert arm/arm64 arch timer to use CLKSRC_OF init 2013-04-11 15:11:15 -05:00
board-kzm9g-reference.c ARM: shmobile: kzm9g-reference: Remove the VCCQ MC0 function GPIO 2013-06-05 17:17:16 +09:00
board-kzm9g.c ARM: shmobile: kzm9g: tidyup FSI pinctrl 2013-06-05 17:18:23 +09:00
board-lager.c ARM: shmobile: lager: Initialize pinmux 2013-06-05 17:18:24 +09:00
board-mackerel.c ARM: shmobile: mackerel: Register pinctrl mapping for USBHS 2013-06-04 21:04:15 +09:00
board-marzen-reference.c ARM: shmobile: marzen: Reference DT implementation 2013-03-18 21:27:02 +09:00
board-marzen.c ARM: shmobile: marzen: Use RCAR_GP_PIN macro 2013-06-05 17:18:24 +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 div6 clocks 2013-06-07 14:24:46 +09:00
clock-r8a7740.c ARM: shmobile: r8a7740: add TPU PWM support 2013-06-07 14:24:44 +09:00
clock-r8a7778.c ARM: shmobile: r8a7778: add SDHI clock support 2013-06-07 14:24:47 +09:00
clock-r8a7779.c ARM: shmobile: r8a7779: Add PCIe clocks 2013-06-07 14:24:46 +09:00
clock-r8a7790.c ARM: shmobile: r8a7790: add TPU PWM support 2013-06-07 14:24:50 +09:00
clock-sh73a0.c ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate 2013-06-07 14:24:52 +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: cpuidle: use init/exit common routine 2013-04-23 13:45:22 +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 Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base 2013-06-11 14:58:57 +09:00
Makefile ARM: shmobile: Initial r8a7790 Lager board support 2013-04-03 10:50:43 +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 cpuidle: remove en_core_tk_irqen flag 2013-04-23 13:45:22 +02:00
setup-emev2.c This is the 2nd part of ARM timer clean-ups for 3.10. This series has 2013-04-17 10:10:01 -07: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 pinmux platform device cleanup 2013-06-05 17:18:22 +09:00
setup-r8a7778.c Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base 2013-06-11 14:58:57 +09:00
setup-r8a7779.c ARM: shmobile: r8a7779 pinmux platform device cleanup 2013-06-05 17:17:13 +09:00
setup-r8a7790.c ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH 2013-06-05 17:18:22 +09:00
setup-sh73a0.c Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base 2013-06-11 14:58:57 +09:00
setup-sh7372.c ARM: convert arm/arm64 arch timer to use CLKSRC_OF init 2013-04-11 15:11:15 -05: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/soc 2013-04-28 15:06:56 -07:00
smp-r8a7779.c Merge branch 'gic/cleanup' into next/soc 2013-04-28 15:06:56 -07:00
smp-sh73a0.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
suspend.c arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
timer.c ARM: convert arm/arm64 arch timer to use CLKSRC_OF init 2013-04-11 15:11:15 -05:00