diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:32:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:32:24 +0100 |
| commit | 3fcb230d14b031a6c3b26e8da56e062574b3e68d (patch) | |
| tree | 8d49b5e0582f3b9815bff893c58f544d507286ab /arch/arm/mach-omap1/timer.c | |
| parent | f3a186fbfd413f2453c511da2dbcdc594c87dbde (diff) | |
| parent | e80499190db2fd752a60468f0fa462f87f993d49 (diff) | |
| download | talos-obmc-linux-3fcb230d14b031a6c3b26e8da56e062574b3e68d.tar.gz talos-obmc-linux-3fcb230d14b031a6c3b26e8da56e062574b3e68d.zip | |
Merge tag 'omap-for-v4.6/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Merge "omap soc changes for v4.6 merge window" from Tony Lindgren:
SoC related changes for omaps for v4.6 merge window:
- Enable runtime revision detection for dra7 to avoid multiple dts
files for various variants
- Add dma_slave_map for omap1/2/3 legacy mode booting
- Add RTC interconnect target data for ti81xx and am43x
- Add custom reset handler for PCIeSS
- Add eDMA interconnect target data for dra7
* tag 'omap-for-v4.6/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1
ARM: OMAP2+: Add rtc hwmod configuration for ti81xx
ARM: DRA7: hwmod: Add custom reset handler for PCIeSS
ARM: OMAP2+: DMA: Provide dma_slave_map to omap-dma for legacy boot
ARM: OMAP1: DMA: Provide dma_slave_map to omap-dma
ARM: OMAP: DRA7: Make use of omap_revision information for soc_is* calls
ARM: AM43XX: hwmod: Add rtc hwmod
ARM: DRA7: hwmod: Add reset data for PCIe
ARM: DRA7: hwmod: Fix OCP2SCP sysconfig
ARM: OMAP2+: hwmod data: Add SSI data for omap36xx
Diffstat (limited to 'arch/arm/mach-omap1/timer.c')
0 files changed, 0 insertions, 0 deletions
