1
0
Fork 0
alistair23-linux/arch/arm/mach-shmobile
Linus Torvalds d6a4c0e5d3 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:

 - new drivers for:
        - Ingenic JZ4780 controller
        - APM X-Gene controller
        - Freescale RaidEngine device
        - Renesas USB Controller

  - remove device_alloc_chan_resources dummy handlers

  - sh driver cleanups for peri peri and related emmc and asoc patches
    as well

  - fixes and enhancements spread over the drivers

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 commits)
  dmaengine: dw: don't prompt for DW_DMAC_CORE
  dmaengine: shdmac: avoid unused variable warnings
  dmaengine: fix platform_no_drv_owner.cocci warnings
  dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
  dmaengine: at_xdmac: unlock spin lock before return
  dmaengine: xgene: devm_ioremap() returns NULL on error
  dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
  dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
  dmaengine: sa11x0: report slave capabilities to upper layers
  dmaengine: vdma: Fix compilation warnings
  dmaengine: fsl_raid: statify fsl_re_chan_probe
  dmaengine: Driver support for FSL RaidEngine device.
  dmaengine: xgene_dma_init_ring_mngr() can be static
  Documentation: dma: Add documentation for the APM X-Gene SoC DMA device DTS binding
  arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
  dmaengine: Add support for APM X-Gene SoC DMA engine driver
  dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
  dmaengine: renesas,usb-dmac: Add device tree bindings documentation
  dmaengine: edma: fixed wrongly initialized data parameter to the edma callback
  dmaengine: ste_dma40: fix implicit conversion
  ...
2015-04-24 09:49:37 -07:00
..
include/mach Renesas ARM Based SoC sh73a0 Multiplatform Updates for v4.1 2015-04-01 16:37:30 -07:00
Kconfig ARM: SoC multiplatform code changes for v4.1 2015-04-22 09:20:15 -07:00
Makefile ARM: SoC multiplatform code changes for v4.1 2015-04-22 09:20:15 -07:00
Makefile.boot Renesas ARM Based SoC sh73a0 Multiplatform Updates for v4.1 2015-04-01 16:37:30 -07:00
board-armadillo800eva.c Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2015-04-24 09:49:37 -07:00
board-bockw-reference.c ARM: shmobile: r8a7778: implement SoC and board CCF support 2015-02-24 06:40:46 +09:00
board-bockw.c mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info 2015-03-05 21:54:26 +05:30
board-kzm9g.c mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info 2015-03-05 21:54:26 +05:30
board-marzen-reference.c Second Round of Renesas ARM Based SoC Boards Cleanups for v3.19 2014-11-19 22:29:59 +01:00
board-marzen.c mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info 2015-03-05 21:54:26 +05:30
clock-r8a7740.c ARM: SoC cleanups for 3.19 2014-12-09 14:18:35 -08:00
clock-r8a7778.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-r8a7779.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-sh73a0.c ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module 2014-12-21 17:11:18 +09:00
clock.c ARM: shmobile: Remove mach/clkdev.h 2015-02-24 07:12:15 +09:00
clock.h ARM: shmobile: Remove shmobile_clk_workaround() implementation 2014-10-30 10:14:57 +09:00
common.h ARM: SoC multiplatform code changes for v4.1 2015-04-22 09:20:15 -07:00
console.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
cpufreq.c cpufreq: cpu0: rename driver and internals to 'cpufreq_dt' 2014-10-03 15:37:54 +02:00
dma-register.h ARM: shmobile: dma: Use defines instead of hardcoded numbers 2014-08-20 09:09:23 +09:00
headsmp-scu.S ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
headsmp.S ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
intc-sh73a0.c ARM: shmobile: remove use of gic_arch_extn.irq_set_wake 2015-03-15 01:28:09 +00:00
intc.h ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h 2014-08-22 12:23:32 +09:00
irqs.h ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h 2014-08-22 12:23:32 +09:00
platsmp-apmu.c ARM: shmobile: Separate APMU resource data into CPU dependant part 2014-11-04 09:31:23 +09:00
platsmp-apmu.h ARM: shmobile: Separate APMU resource data into CPU dependant part 2014-11-04 09:31:23 +09:00
platsmp-scu.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
platsmp.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
pm-r8a7740.c ARM: shmobile: R-Mobile: Store SYSC base address in rmobile_pm_domain 2015-01-13 09:33:19 +09:00
pm-r8a7779.c ARM: shmobile: Convert to genpd flags for PM clocks for r8a7779 2014-12-04 00:44:44 +01:00
pm-rcar-gen2.c ARM: shmobile: Consolidate the pm code for R-Car Gen2 2015-03-17 08:05:13 +09:00
pm-rcar.c ARM: shmobile: Cleanup pm-rcar.o build using Kconfig 2014-09-02 09:32:05 +09:00
pm-rcar.h ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case 2014-06-17 17:09:40 +09:00
pm-rmobile.c ARM: shmobile: R-Mobile: Special-case PM domains with memory-controllers 2015-01-16 11:02:42 +09:00
pm-rmobile.h ARM: shmobile: R-Mobile: Add DT support for PM domains 2015-01-15 08:38:14 +09:00
pm-sh73a0.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
r8a7740.h ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
r8a7778.h Renesas ARM Based SoC Cleanup for v3.19 2014-11-04 14:43:02 -08:00
r8a7779.h ARM: shmobile: marzen-reference: Enable TMU0 in device tree 2014-08-17 09:00:56 +09:00
r8a7790.h ARM: shmobile: Consolidate the pm code for R-Car Gen2 2015-03-17 08:05:13 +09:00
r8a7791.h ARM: shmobile: Consolidate the pm code for R-Car Gen2 2015-03-17 08:05:13 +09:00
rcar-gen2.h ARM: shmobile: Consolidate the pm code for R-Car Gen2 2015-03-17 08:05:13 +09:00
regulator-quirk-rcar-gen2.c ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk 2015-03-11 09:52:12 +09:00
setup-emev2.c ARM: make arrays containing machine compatible strings const 2015-02-19 09:44:17 +01:00
setup-r7s72100.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a73a4.c ARM: shmobile: r8a73a4: Remove legacy code 2015-02-25 16:14:02 +09:00
setup-r8a7740.c ARM: shmobile: r8a7740: Remove restart callback 2015-03-12 08:43:35 +09:00
setup-r8a7778.c ARM: shmobile: r8a7778: implement SoC and board CCF support 2015-02-24 06:40:46 +09:00
setup-r8a7779.c ARM: shmobile: remove use of gic_arch_extn.irq_set_wake 2015-03-15 01:28:09 +00:00
setup-r8a7790.c ARM: shmobile: r8a7790: Remove legacy code 2014-12-21 17:03:50 +09:00
setup-r8a7791.c ARM: shmobile: r8a7791: Remove legacy code 2014-10-30 10:14:57 +09:00
setup-r8a7794.c ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs 2014-09-16 15:01:58 +09:00
setup-rcar-gen2.c ARM: SoC platform updates for v4.1 2015-04-22 09:08:39 -07:00
setup-sh73a0.c ARM: shmobile: sh73a0: Remove restart callback 2015-02-24 08:22:50 +09:00
sh-gpio.h ARM: shmobile: mackerel: Use pinconf API to configure pin pull-down 2013-12-10 17:24:49 +09:00
sh73a0.h ARM: shmobile: sh73a0: Remove unused sh73a0_add_standard_devices_dt() 2015-02-24 08:22:49 +09:00
smp-emev2.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
smp-r8a7779.c ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation 2015-02-24 07:12:16 +09:00
smp-r8a7790.c ARM: DT updates for v4.1 2015-04-22 09:09:46 -07:00
smp-r8a7791.c ARM: DT updates for v4.1 2015-04-22 09:09:46 -07:00
smp-sh73a0.c ARM: shmobile: sh73a0: Add Multiplatform support 2015-02-24 08:22:45 +09:00
suspend.c arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
timer.c Third Round of Renesas ARM Based SoC Fixes for v3.19 2015-02-01 08:51:12 -08:00