android_kernel_motorola_sm6225/arch/arm/mach-shmobile
Linus Torvalds 4bb2d1009f ARM: More SoC support updates
This branch contains a handful of updates of SoC base code that had
 dependencies on other external trees that have now been merged:
 
 * Support for the new EXYNOS5250 SoC from Samsung
 * SMP and power domain support for Tegra3 from NVIDIA
 * ux500 updates for exporting SoC information through sysfs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcpwnAAoJEIwa5zzehBx3RIQP/AvTVHF7EIXfu5XGLBYeKW+U
 HBeT1kO1qL8m3gA/+DG/JzNpd8JDlILGob6hUN4lqA8f49MBkmttdbATZvBj4Nx+
 T4+louPteiueexJdolj6hVCuNBhFJLgik3zMKGHvL8wbvqYHKpfqvuWWuzxtP3Hl
 F1BvFSrQ5TZALGtNiRWDMwxFa2oA03ZNXjy+v9i3GIdn1vH18/IDryz7/7MW6GPv
 NuKmZkcEpX2jDFe3AkqUMLxqMYizfuGg20FlV4tmxiF5Wlht6EiN38Y56LZgwuly
 mde6AWN8qgwTYDk4cJ5ZVJtwkowosF5ko57V3SPmVaVc/WajZ0v28gt9YgNLVPL7
 TXFEUJgIxzJnyM+DoSltzQ9tCsWUscQGmyPt4QSOLO2D76/3z+8+24/EwAIM/7Bj
 u5/+74k5jDBZe1suCt/1P1Vr3l5Z3os483R7y4BtyLtWtQvBcjpkITj9lHmnsAf3
 RqN2Z4osLcILwWVKa2y2DCOeJm0jvSCsn53+O3FGTSqhfwWTUVkqaDALeGXwJGbH
 2rMks18BqJ2sT2ruFXHiVvZOj/8XxkcLsq8ztnuYoHQssrNtAtBM97l/xi1V7L0z
 FmXnPszVA1mIkelsY2VDImEks/Iaad4o3Iuba9Yr3OKOSr/d8kLyB0reTmS/SHQL
 u/o8ch/V5QVEo/H+ud7K
 =X89H
 -----END PGP SIGNATURE-----

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

Pull "ARM: More SoC support updates" from Olof Johansson:
 "This branch contains a handful of updates of SoC base code that had
  dependencies on other external trees that have now been merged:

   * Support for the new EXYNOS5250 SoC from Samsung
   * SMP and power domain support for Tegra3 from NVIDIA
   * ux500 updates for exporting SoC information through sysfs"

Fix up trivial merge conflicts as per Olof.

* tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
  ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer
  ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board
  ARM: dts: add initial dts file for EXYNOS5250, SMDK5250
  ARM: EXYNOS: add support device tree enabled board file for EXYNOS5
  ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs
  ARM: EXYNOS: add support get_core_count() for EXYNOS5250
  ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5
  ARM: EXYNOS: add interrupt definitions for EXYNOS5250
  ARM: EXYNOS: add support for EXYNOS5250 SoC
  ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5
  ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5
  ARM: EXYNOS: add clock part for EXYNOS5250 SoC
  ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()
  ARM: EXYNOS: to declare static for mach-exynos/common.c
  ARM: EXYNOS: Add clkdev lookup entry for lcd clock
  ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
  ARM: tegra: support for secondary cores on Tegra30
  ARM: tegra: support for Tegra30 CPU powerdomains
  ARM: tegra: add support for Tegra30 powerdomains
  ARM: tegra: export tegra_powergate_is_powered()
  ...
2012-03-28 12:24:40 -07:00
..
include/mach Merge branch 'renesas/soc' into next/soc2 2012-03-24 19:13:59 +00:00
board-ag5evm.c ARM: timer cleanup work 2012-03-27 16:06:17 -07:00
board-ap4evb.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
board-bonito.c ARM: timer cleanup work 2012-03-27 16:06:17 -07:00
board-g3evm.c ARM: mach-shmobile: sh7367 and G3EVM timer rework 2012-03-12 22:19:44 +01:00
board-g4evm.c ARM: mach-shmobile: sh7377 and G4EVM timer rework 2012-03-12 22:19:44 +01:00
board-kota2.c ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework 2012-03-12 22:19:45 +01:00
board-mackerel.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
board-marzen.c ARM: mach-shmobile: r8a7779 and Marzen timer rework 2012-03-12 22:19:46 +01:00
clock-r8a7740.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-r8a7779.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh73a0.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7367.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7372.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7377.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c ARM: mach-shmobile: early console support using earlyprintk 2010-02-09 10:34:12 +09:00
cpuidle.c ARM: mach-shmobile: cpuidle single/global and last_state fixes 2011-11-11 16:49:28 +09:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT 2012-01-09 10:36:48 +09:00
hotplug.c ARM: mach-shmobile: Flush caches in platform_cpu_die() 2012-01-09 10:37:29 +09:00
intc-r8a7740.c ARM: mach-shmobile: r8a7740: add INTC support 2011-11-11 16:55:37 +09:00
intc-r8a7779.c ARM: mach-shmobile: r8a7779 and Marzen base support V2 2012-01-09 10:13:59 +09:00
intc-sh73a0.c ARM: mach-shmobile: sh73a0 IRQ sparse alloc fix 2012-01-18 10:12:56 +10:00
intc-sh7367.c ARM: mach-shmobile: Use common INTC IRQ code on sh7367 2011-11-05 01:01:50 +09:00
intc-sh7372.c PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume 2011-12-25 23:39:11 +01:00
intc-sh7377.c ARM: mach-shmobile: Use common INTC IRQ code on sh7377 2011-11-05 01:01:50 +09:00
Kconfig Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest 2012-01-10 17:10:55 +09:00
Makefile ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pfc-r8a7740.c ARM: mach-shmobile: r8a7740: add PFC support. 2011-11-11 16:55:33 +09:00
pfc-r8a7779.c ARM: mach-shmobile: r8a7779 PFC IPSR4 fix 2012-02-24 13:24:59 +09:00
pfc-sh73a0.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7367.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7372.c ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372 2012-01-24 10:40:25 +09:00
pfc-sh7377.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
platsmp.c ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
pm-r8a7779.c ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
pm-sh7372.c PM / shmobile: fix A3SP suspend method 2012-01-14 00:40:14 +01:00
setup-r8a7740.c ARM: mach-shmobile: r8a7740 and Bonito timer rework 2012-03-12 22:19:45 +01:00
setup-r8a7779.c ARM: shmobile: remove additional __io() macro use 2012-03-14 01:05:42 +01:00
setup-sh73a0.c ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework 2012-03-12 22:19:45 +01:00
setup-sh7367.c ARM: mach-shmobile: sh7367 and G3EVM timer rework 2012-03-12 22:19:44 +01:00
setup-sh7372.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
setup-sh7377.c ARM: mach-shmobile: sh7377 and G4EVM timer rework 2012-03-12 22:19:44 +01:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-r8a7779.c ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
smp-sh73a0.c Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00
suspend.c ARM: mach-shmobile: Suspend-to-RAM support 2011-05-25 11:19:17 +09:00
timer.c Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00