]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorSuman Anna <s-anna@ti.com>
Sat, 30 May 2015 00:36:15 +0000 (19:36 -0500)
committerSuman Anna <s-anna@ti.com>
Sat, 30 May 2015 00:38:09 +0000 (19:38 -0500)
commitaf6122384b916a1d36496a71d8ad05bd7af5abc4
treeeb2fed49814d6b994574fcd501dd89b03c0c46d9
parentbd3001cfd34d93315848dde11a3ff79d15d19b92
parente555469f52a19e030b5ae14d5109c59c187bb2df
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into rproc-linux-3.14.y

Resync with the latest platform base code. Relevant
fixes include fixes on DPLL bypass clock settings
and support for Timers 12 through 16.

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: (127 commits)
  ARM: OMAP: Check for clocks which do not have parents
  ARM: OMAP: DRA7: clockdomain: Implement timer workaround for errata i874
  ARM: dts: DRA7: Add DT node for AES2 IP
  ARM: DRA7: hwmod: Add data for AES2 IP
  crypto: omap-aes - Add support for multiple cores
  crypto: omap-aes - Fix registration of Algos
  crypto: omap-aes - Fix enabling clocks
  crypto: tcrypt - Added speed tests for Async AEAD crypto alogrithms
  crypto: omap-aes - Add support for GCM mode
  crypto: omap-aes - Fix configuring of AES mode
  crypto: omap-aes - Add support for lengths not aligned with AES_BLOCK_SIZE
  crypto: omap-des: Fix unmapping of dma channels
  dmaenegine: edma: allow pause/resume for non-cyclic mode
  ARM: common: edma: clear completion interrupts on stop
  bus: omap_l3_noc: Fix master id address decoding for OMAP5
  ARM: edma: Clear IRQ if we get interrupted by a unknown event
  bus: omap_l3_noc: Fix connID for OMAP4
  bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
  crypto: omap-sham: Use pm_runtime_irq_safe()
  crypto: omap-sham: Add the offset of sg page to vaddr
  ...

Signed-off-by: Suman Anna <s-anna@ti.com>
14 files changed:
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clockdomains7xx_data.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
drivers/clk/ti/clk-7xx.c