On Thu, Jan 29, 2015 at 12:59:56AM +0000, Kuninori Morimoto wrote: > > Hi Vinod, Mark > > These are v4 of shdma-base fixup patches. > Original patch came from Arnd. > I added Arnd/Ulf's Acked-by if it got it in pervious patch-set. The series looks fine > > Mark > Can you please check these patces ? > 3) 4) : for SPI > 7) 8) 9) : for ASoC > > Vinod > > 5) 6) patches are based on Vinod's next branch + Ulf's > git.linaro.org/people/ulf.hansson/mmc.git tmio > > Easy way to merge these are maybe... > Pattern 1) Vinod merges Ulf's tmio branch, and apply all these pathces > Pattern 2) Vinod apply these patches except 5) 6), and Ulf merge Vinod's branch > and apply 5) 6) patches Or pattern 3, apply this after merge window. I am assuming Ulf rmio will be queued up. -- ~Vinod > > Arnd Bergmann (4): > 1) dmaengine: shdma: use normal interface for passing slave id > 2) mtd: sh_flctl: remove slave_id settings for DMAEngine > 3) spi: rspi: remove slave_id settings for DMAEngine > 4) spi: sh-msiof: remove slave_id settings for DMAEngine > > Kuninori Morimoto (5): > 5) mmc: sh_mmcif: remove slave_id settings for DMAEngine > 6) mmc: tmio_mmc: remove slave_id settings for DMAEngine > 7) ASoC: rsnd: remove slave_id settings for DMAEngine > 8) ASoC: fsi: remove slave_id settings for DMAEngine > 9) ASoC: fsi: Configure DMA slave settings > > drivers/dma/sh/shdma-base.c | 73 +++++++++++++++++++++++++++---------- > drivers/mmc/host/sh_mmcif.c | 13 +++---- > drivers/mmc/host/sh_mobile_sdhi.c | 2 - > drivers/mmc/host/tmio_mmc.h | 2 - > drivers/mmc/host/tmio_mmc_dma.c | 4 -- > drivers/mtd/nand/sh_flctl.c | 2 - > drivers/spi/spi-rspi.c | 1 - > drivers/spi/spi-sh-msiof.c | 1 - > include/linux/shdma-base.h | 1 + > sound/soc/sh/fsi.c | 18 ++++++--- > sound/soc/sh/rcar/core.c | 3 +- > 11 files changed, 73 insertions(+), 47 deletions(-) > > Best regards > --- > Kuninori Morimoto > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
