linux/arch/arm/plat-samsung/include/plat
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
..
adc-core.h ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX 2011-10-12 21:34:42 +09:00
adc.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
audio-simtec.h ARM: S3C24XX: Consolidate Simtec extensions 2012-03-07 01:47:11 -08:00
audio.h ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
backlight.h ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set() 2011-08-19 20:57:20 +09:00
camport.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
clock-clksrc.h ARM: S3C64XX: Avoid announcing clksrc clocks twice 2010-01-15 17:10:10 +09:00
clock.h ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443 2012-03-07 02:00:04 -08:00
common-smdk.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
cpu-freq-core.h ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440 2011-12-28 15:08:28 +09:00
cpu-freq.h ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung 2010-02-23 00:03:42 +00:00
cpu.h ARM: EXYNOS: add support for EXYNOS5250 SoC 2012-03-14 02:13:06 -07:00
debug-macro.S ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
devs.h Merge branch 'samsung/soc' into next/soc2 2012-03-15 21:22:00 +00:00
dma-core.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
dma-ops.h ARM: fixes for ARM platforms 2012-01-17 18:55:56 -08:00
dma-pl330.h ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC 2012-03-10 22:51:20 -08:00
dma-s3c24xx.h arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
dma.h ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h 2012-01-12 02:00:16 +09:00
ehci.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
fb-core.h ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
fb-s3c2410.h ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
fb.h ARM: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
fimc-core.h ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
fiq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
gpio-cfg-helpers.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
gpio-cfg.h ARM: SAMSUNG: include linux/types.h at gpio-cfg.h 2011-11-17 01:17:18 +09:00
gpio-core.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
gpio-fns.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
hwmon.h ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung 2010-05-12 17:43:03 +09:00
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
iic.h ARM: SAMSUNG: add i2c hdmiphy controller definitions 2011-10-04 18:58:21 +09:00
irq-uart.h ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung 2010-01-15 17:10:14 +09:00
irq-vic-timer.h ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip 2011-05-09 10:12:39 +02:00
irq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
irqs.h ARM: SAMSUNG: Move timer irq numbers to end of linux irq space 2011-12-23 10:04:39 +09:00
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h Input: samsung-keypad - enable compiling on other platforms 2011-11-15 09:46:14 -08:00
map-base.h ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space 2010-10-25 16:11:38 +09:00
map-s3c.h ARM: SAMSUNG: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
map-s5p.h ARM: SAMSUNG: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
mci.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
mfc.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
mipi_csis.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
nand-core.h ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
nand.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-03-12 16:04:50 -08:00
onenand-core.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pd.h ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
pll.h ARM: SAMSUNG: Consolidate plat/pll.h 2011-10-04 19:48:42 +09:00
pm.h Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2012-01-08 13:10:57 -08:00
pwm-clock.h ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
regs-ac97.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-adc.h ARM: SAMSUNG: Add adc registers for S3C2443/S3C2416 2011-10-12 21:34:32 +09:00
regs-ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
regs-dma.h ARM: S3C24XX: Reuse S3C2443 dma for S3C2416 2012-03-07 01:53:17 -08:00
regs-fb-v4.h s3c-fb: integrate palette setup code into main driver 2010-08-11 08:59:10 -07:00
regs-fb.h video: s3c-fb: Add support EXYNOS5 FIMD 2012-03-06 11:57:14 +00:00
regs-iic.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-iis.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-irqtype.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-nand.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-onenand.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
regs-rtc.h rtc-s3c: add variants for S3C2443 and S3C2416 2012-02-07 08:03:42 +09:00
regs-sdhci.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-serial.h serial: samsung: merge probe() function from all SoC specific extensions 2011-12-23 10:07:00 +09:00
regs-spi.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-srom.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
regs-timer.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
regs-udc.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-usb-hsotg-phy.h ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
regs-usb-hsotg.h USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode 2010-08-10 14:35:42 -07:00
regs-watchdog.h ARM: SAMSUNG: Move more support into plat-samsung 2010-01-21 13:45:51 +09:00
rtc-core.h ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices 2012-02-07 08:03:43 +09:00
s3c64xx-spi.h ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h 2012-01-12 02:12:02 +09:00
s3c244x.h ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c2410.h ARM: S3C2410: move s3c2410_baseclk_add to clock.h 2012-01-31 20:06:43 +09:00
s3c2412.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s3c2416.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s3c2443.h ARM: S3C24XX: move common S3C2443 clock definitions to clock.h 2012-01-31 20:06:42 +09:00
s5p-clock.h ARM: EXYNOS: add clock part for EXYNOS5250 SoC 2012-03-14 02:13:03 -07:00
s5p-time.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
sdhci.h ARM: SAMSUNG: support the second capability for samsung-soc 2012-03-10 23:40:28 -08:00
sysmmu.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
ts.h ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
tv-core.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
udc-hs.h ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
udc.h usb: gadget: s3c-hsudc: move platform_data struct to global header 2011-12-21 13:24:27 +02:00
uncompress.h ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
usb-control.h ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung 2010-02-23 00:03:42 +00:00
usb-phy.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00