linux_old1/arch/arm/mach-ux500
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
..
Kconfig ARM: ux500: select REGULATOR 2013-05-15 15:54:00 +02:00
Makefile ARM: ux500: build hotplug.o for ARMv7-a 2013-04-08 13:59:54 +02:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
board-mop500-audio.c ARM: ux500: Replace ST-E's home-brew DMA direction definition with the generic one 2013-06-04 11:12:07 +02:00
board-mop500-pins.c ARM: ux500: board-mop500: remove unused pin modes 2013-06-14 17:15:34 -07:00
board-mop500-regulators.c Minor board changes for v3.11 merge window. These are 2013-06-20 21:37:55 +02:00
board-mop500-regulators.h ARM: arm-soc non-critical fixes for 3.10 2013-05-02 08:56:55 -07:00
board-mop500-sdi.c ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
board-mop500-stuib.c Input: bu21013_ts - move GPIO init and exit functions into the driver 2012-11-27 23:05:11 -08:00
board-mop500-u8500uib.c ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
board-mop500-uib.c ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> 2013-04-08 13:59:28 +02:00
board-mop500.c Merge branch 'ux500/cleanup' into next/drivers 2013-06-21 14:48:58 +02:00
board-mop500.h Merge branch 'ux500/cleanup' into next/drivers 2013-06-21 14:48:58 +02:00
cache-l2x0.c ARM: ux500: bail out on alien cpus 2013-06-27 15:00:56 +02:00
cpu-db8500.c ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
cpu.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
cpuidle.c ARM: ux500: Only configure wake-up reasons on ux500 based platforms 2013-05-27 14:08:20 +02:00
db8500-regs.h ARM: ux500: avoid warning in ux500_read_asicid 2013-06-04 11:21:58 +02:00
devices-common.c ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
devices-common.h ARM: ux500: add PRCM register base for pinctrl 2012-11-08 13:44:41 +01:00
devices-db8500.c ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
devices-db8500.h ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
devices.c ARM: ux500: make remaining headers local 2013-04-08 13:59:48 +02:00
devices.h ARM: ux500: make remaining headers local 2013-04-08 13:59:48 +02:00
headsmp.S ARM: ux500: add missing ENDPROC to headsmp.S 2012-01-16 08:36:03 -06:00
hotplug.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
id.c ARM: ux500: avoid warning in ux500_read_asicid 2013-06-04 11:21:58 +02:00
id.h ARM: ux500: de-globalize <mach/id.h> 2013-01-29 18:47:37 +01:00
irqs-board-mop500.h ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
irqs-db8500.h ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
irqs.h ARM: ux500: make irqs.h local to platform 2013-04-08 13:59:44 +02:00
pins-db8500.h ARM: ux500: remove a bunch of internal pull-ups 2012-04-24 09:36:05 +02:00
platsmp.c ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
pm.c ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> 2013-04-08 13:59:28 +02:00
setup.h ARM: ux500: Remove duplicated assignment of ab8500_platdata 2013-05-14 10:14:40 +02:00
ste-dma40-db8500.h dmaengine: ste_dma40: Amalgamate DMA source and destination channel numbers 2013-05-23 21:11:51 +02:00
timer.c Merge tag 'ux500-multiplatform-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/multiplatform 2013-04-09 16:01:52 +02:00
usb.c ARM: ux500: Replace ST-E's home-brew DMA direction definition with the generic one 2013-06-04 11:12:07 +02:00