Hi, For merging this series, I suggest the following sets: * Joel A Fernandes <joelagnel@xxxxxx> [130620 14:13]: > > Joel A Fernandes (3): > edma: config: Enable config options for EDMA > da8xx: config: Enable MMC and FS options > ARM: davinci: Fix compiler warnings in devices-da8xx > > Matt Porter (8): > dmaengine: edma: Add TI EDMA device tree binding > ARM: edma: Add DT and runtime PM support to the private EDMA API > ARM: edma: Add EDMA crossbar event mux support > dmaengine: edma: enable build for AM33XX Sekhar should queue the above patches, I've acked the mach-omap2/Kconfig change. > spi: omap2-mcspi: add generic DMA request support to the DT binding > spi: omap2-mcspi: convert to dma_request_slave_channel_compat() The spi changes should get merged via the driver list. > ARM: dts: add AM33XX EDMA support > ARM: dts: add AM33XX SPI DMA support Benoit should queue the .dts changes. > Documentation/devicetree/bindings/dma/ti-edma.txt | 34 +++ > Documentation/devicetree/bindings/spi/omap-spi.txt | 27 ++- > arch/arm/Kconfig | 1 + > arch/arm/boot/dts/am33xx.dtsi | 22 ++ > arch/arm/common/edma.c | 242 ++++++++++++++++++-- > arch/arm/configs/da8xx_omapl_defconfig | 3 + > arch/arm/mach-davinci/devices-da8xx.c | 8 +- > arch/arm/mach-omap2/Kconfig | 2 + > drivers/dma/Kconfig | 4 +- > drivers/spi/spi-omap2-mcspi.c | 64 ++++-- > include/linux/platform_data/edma.h | 5 +- > 11 files changed, 369 insertions(+), 43 deletions(-) > create mode 100644 Documentation/devicetree/bindings/dma/ti-edma.txt Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
