Commit 4c4d285ad5665bfbd983b95fde8d7a477d24a361
Exists in
master
and in
38 other branches
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
SH/R-Mobile updates for 3.3 merge window. * tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh: (32 commits) arm: mach-shmobile: add a resource name for shdma ARM: mach-shmobile: r8a7779 SMP support V3 ARM: mach-shmobile: Add kota2 defconfig. ARM: mach-shmobile: Add marzen defconfig. ARM: mach-shmobile: r8a7779 power domain support V2 ARM: mach-shmobile: Fix up marzen build for recent GIC changes. ARM: mach-shmobile: r8a7779 PFC function support ARM: mach-shmobile: Flush caches in platform_cpu_die() ARM: mach-shmobile: Allow SoC specific CPU kill code ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support ARM: mach-shmobile: Marzen LAN89218 support ARM: mach-shmobile: Marzen SCIF2/SCIF4 support ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2 ARM: mach-shmobile: r8a7779 and Marzen base support V2 sh: pfc: Unlock register support sh: pfc: Variable bitfield width config register support sh: pfc: Add config_reg_helper() function sh: pfc: Convert index to field and value pair ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 28 changed files Side-by-side Diff
- arch/arm/configs/bonito_defconfig
- arch/arm/configs/kota2_defconfig
- arch/arm/configs/marzen_defconfig
- arch/arm/mach-shmobile/Kconfig
- arch/arm/mach-shmobile/Makefile
- arch/arm/mach-shmobile/board-bonito.c
- arch/arm/mach-shmobile/board-marzen.c
- arch/arm/mach-shmobile/clock-r8a7740.c
- arch/arm/mach-shmobile/clock-r8a7779.c
- arch/arm/mach-shmobile/headsmp.S
- arch/arm/mach-shmobile/hotplug.c
- arch/arm/mach-shmobile/include/mach/common.h
- arch/arm/mach-shmobile/include/mach/r8a7740.h
- arch/arm/mach-shmobile/include/mach/r8a7779.h
- arch/arm/mach-shmobile/intc-r8a7740.c
- arch/arm/mach-shmobile/intc-r8a7779.c
- arch/arm/mach-shmobile/pfc-r8a7740.c
- arch/arm/mach-shmobile/pfc-r8a7779.c
- arch/arm/mach-shmobile/platsmp.c
- arch/arm/mach-shmobile/pm-r8a7779.c
- arch/arm/mach-shmobile/setup-r8a7740.c
- arch/arm/mach-shmobile/setup-r8a7779.c
- arch/arm/mach-shmobile/setup-sh7372.c
- arch/arm/mach-shmobile/setup-sh73a0.c
- arch/arm/mach-shmobile/smp-r8a7779.c
- drivers/sh/pfc.c
- drivers/tty/serial/sh-sci.h
- include/linux/sh_pfc.h