linux-sg2042/arch/arm/plat-samsung/include/plat
Linus Torvalds 42daabf62b ARM SoC late changes
These are changes that arrived a little late before the merge
 window or that have multiple dependencies on previous branches
 so they did not fit into one of the earlier ones. There
 are 10 branches merged here, a total of 39 non-merge commits.
 Contents are a mixed bag for the above reasons:
 
 * Two new SoC platforms: ST microelectronics stixxxx and
   the TI 'Nspire' graphing calculator. These should have
   been in the 'soc' branch but were a little late
 * Support for the Exynos 5420 variant in mach-exynos,
   which is based on the other exynos branches to avoid
   conflicts.
 * Various small changes for sh-mobile, ux500 and davinci
 * Common clk support for MSM
 
 Conflicts:
 * In Kconfig.debug, various additions trivially conflict,
   the list should be kept in alphabetical order when
   resolving.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUdLnl2CrR//JCVInAQIrKhAAwvtsGNe6j9nDuLEitWtQAmhHYZQyUJ8k
 o9j/1j1CqhE8C0bLRud8D4m1GxfxbGeRm2d0HoNbxda3FmntUufqBDi6neMiQiLO
 VltC5rOYL8Mday0Asc3SBfjBj8SZC2bypicKy5zUfzsObCBt343g1WvYffMDNmwH
 FveOQK6q2BKmO67cazc9tk5xmxjVwP/LB8r5mQtiXmMguw0R+ZIDDIP6xaURFkxX
 SAElleD2wtvpVHP1d6AKHpXN99u3xV3uoJjKljECEXdBzW/ZX8m7FG2tKY5xy368
 ta0Nhh2MSRnBhUYOH9uah4PQWYEsbZ+M/W+3J9tKRu6q9D/c/AAxILyXUY2tcHNC
 o1UwcUn1druirx3X1AW8HYAGNwW7BD3HANzIiUkQZG7ByfM4qCtUEo2SAFNIGBoR
 v1FMLhMPgMWotZnKrDQQd0anxkKIOFaSMRVgpQLW2jQt/B7sHLmEH2yDffkbSD76
 PQDThnW/dfm9dgeK+X4fPrveIMKbjQlbFz0okN+LPsUf8e1045HBgCi2A0lTIGWM
 kVVgXHKKXi8G8HBa4VyDlORVHXk1bJEheF+zlDvdk4fHkcf+H/OfvFG2O9TdIdpb
 ITXRyyteaRM4YIZpnJbzeeZDZXT89c2ah7xq36iM+L1ScidyntPquViXeasSc8r6
 pKu9ZDc0Mow=
 =cRu2
 -----END PGP SIGNATURE-----

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

Pull ARM SoC late changes from Arnd Bergmann:
 "These are changes that arrived a little late before the merge window
  or that have multiple dependencies on previous branches so they did
  not fit into one of the earlier ones.  There are 10 branches merged
  here, a total of 39 non-merge commits.  Contents are a mixed bag for
  the above reasons:

   * Two new SoC platforms: ST microelectronics stixxxx and the TI
     'Nspire' graphing calculator.  These should have been in the 'soc'
     branch but were a little late
   * Support for the Exynos 5420 variant in mach-exynos, which is based
     on the other exynos branches to avoid conflicts.
   * Various small changes for sh-mobile, ux500 and davinci
   * Common clk support for MSM"

* tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: ux500: bail out on alien cpus
  ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins
  serial: sh-sci: Initialise variables before access in sci_set_termios()
  ARM: stih41x: Add B2020 board support
  ARM: stih41x: Add B2000 board support
  ARM: sti: Add DEBUG_LL console support
  ARM: sti: Add STiH416 SOC support
  ARM: sti: Add STiH415 SOC support
  ARM: msm: Migrate to common clock framework
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove custom clk_set_flags() API
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  msm: iommu: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  msm_serial: Convert to clk_prepare/unprepare
  ...
2013-07-02 14:42:51 -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 ARM defconfigs: add missing inclusions of linux/platform_device.h 2013-02-14 15:14:32 -08:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +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
clock.h ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443 2012-03-07 02:00:04 -08:00
cpu-freq-core.h cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq 2013-05-20 23:04:28 +09:00
cpu-freq.h cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq 2013-05-20 23:04:28 +09:00
cpu.h ARM: EXYNOS: Add support for EXYNOS5420 SoC 2013-06-19 04:09:32 +09:00
devs.h Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
dma-core.h
dma-ops.h ARM: SAMSUNG: Remove unnecessary code for dma 2013-04-08 21:42:10 +09:00
dma-pl330.h ARM: SAMSUNG: Remove unnecessary code for dma 2013-04-08 21:42:10 +09:00
dma-s3c24xx.h ARM: S3C24XX: remove obsolete s3c2412 specific dma settings 2013-05-21 01:01:41 +09:00
dma.h ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h 2012-01-12 02:00:16 +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 video/s3c: move platform_data out of arch/arm 2013-04-11 14:49:20 +03:00
fimc-core.h ARM: SAMSUNG: Silence empty switch warning in fimc-core.h 2013-02-12 10:27:55 -08: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 treewide: Put a space between #include and FILE 2012-06-28 11:44:36 +02:00
gpio-core.h ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h 2013-01-10 10:45:22 -08:00
hdmi.h ARM: SAMSUNG: Add API to set platform data for s5p-tv driver 2012-08-08 15:53:38 +09:00
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
irq-uart.h
irq-vic-timer.h ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip 2011-05-09 10:12:39 +02: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: Fix for S3C2412 EBI memory mapping 2012-06-21 03:53:46 +09:00
map-s5p.h ARM: EXYNOS: Add IO mapping for non-secure SYSRAM. 2013-04-09 01:52:30 +09:00
mfc.h ARM: EXYNOS: Add MFC device tree support 2012-10-19 10:26:31 +09:00
nand-core.h ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
onenand-core.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pll.h ARM: SAMSUNG: Consolidate plat/pll.h 2011-10-04 19:48:42 +09:00
pm.h ARM: SAMSUNG: Introduce GPIO_SAMSUNG Kconfig entry 2013-06-19 01:24:27 +09:00
pwm-clock.h ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +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-irqtype.h
regs-nand.h
regs-serial.h tty: serial/samsung: make register definitions global 2013-04-11 13:14:36 -07: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
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
rtc-core.h ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC" 2013-04-04 08:48:24 +09:00
s5p-clock.h ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll 2012-05-16 07:03:41 +09:00
samsung-time.h ARM: S5PC100: Add samsung-time support for s5pc100 2013-03-05 20:19:54 +09:00
sdhci.h ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
spi-core.h ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
tv-core.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
uncompress.h ARM: SAMSUNG: Use local definitions of watchdog registers 2013-06-19 03:13:15 +09:00
usb-phy.h usb: exynos: do not include plat/usb-phy.h 2013-04-11 14:27:55 -07:00
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h ARM: SAMSUNG: Remove legacy watchdog reset code 2013-06-19 03:13:17 +09:00