kevin/linux
1
Fork 0
Code
4bb2d1009f
linux/arch/arm/mach-exynos
History
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 ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
clock-exynos4.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
clock-exynos4.h ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
clock-exynos5.c ARM: EXYNOS: add clock part for EXYNOS5250 SoC 2012-03-14 02:13:03 -07:00
clock-exynos4210.c ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
clock-exynos4212.c ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
common.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
common.h ARM: EXYNOS: add support for EXYNOS5250 SoC 2012-03-14 02:13:06 -07:00
cpuidle.c ARM: EXYNOS: Add support AFTR mode on EXYNOS4210 2012-03-09 07:04:43 -08:00
dev-ahci.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
dev-audio.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
dev-dwmci.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-ohci.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00
dev-sysmmu.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
dev-uart.c ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
dma.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
Kconfig ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
mach-armlex4210.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-exynos4-dt.c ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board 2012-03-14 22:22:13 -07:00
mach-exynos5-dt.c ARM: EXYNOS: add support device tree enabled board file for EXYNOS5 2012-03-14 22:22:06 -07:00
mach-nuri.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
mach-origen.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-smdk4x12.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-smdkv310.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-universal_c210.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
Makefile ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
Makefile.boot ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
mct.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
platsmp.c ARM: EXYNOS: add support get_core_count() for EXYNOS5250 2012-03-14 02:35:15 -07:00
pm_domains.c ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure 2012-03-10 02:54:36 -08:00
pm.c Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
pmu.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimc.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimd0.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c0.c ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5 2012-03-14 02:13:04 -07:00
setup-i2c1.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c2.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c3.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c4.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c5.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c6.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c7.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-keypad.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-sdhci-gpio.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-spi.c ARM: EXYNOS: Modified files for SPI consolidation work 2011-12-26 16:42:15 +09:00
setup-usb-phy.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00