On 16-12-21, 17:29, Dmitry Osipenko wrote: > 15.12.2021 22:19, Dmitry Osipenko пишет: > > 15.12.2021 21:57, Mark Brown пишет: > >> On Sat, Dec 04, 2021 at 05:37:03PM +0300, Dmitry Osipenko wrote: > >> > >>> I based S/PDIF patches on Arnd's Bergmann patch from a separate series [1] > >>> that removes obsolete slave_id. This eases merging of the patches by > >>> removing the merge conflict. This is a note for Mark Brown. > >> That's not in my tree so I'll need either a pull request with the series > >> or a resend after the merge window. > > This patch is included as a part of this series, please see the patch #6. > > > > I saw that Vinod Koul already merged it into his DMA tree [1] a day ago, > > but there is no stable branch there. > > > > [1] > > https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git/log/?h=next > > > > Vinod, will you be a able to create immutable branch for us with the > "dmaengine: kill off dma_slave_config->slave_id" patches [1]? > > [1] https://lore.kernel.org/all/[email protected]/
Here you go:
The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
tags/dmaengine_topic_slave_id_removal_5.17
for you to fetch changes up to 3c219644075795a99271d345efdfa8b256e55161:
dmaengine: remove slave_id config field (2021-12-17 11:23:56 +0530)
----------------------------------------------------------------
dmaengine_topic_slave_id_removal_5.17
Tag for dmaengine slave_id removal topic branch which should be merged
into v5.17
----------------------------------------------------------------
Arnd Bergmann (11):
ASoC: tegra20-spdif: stop setting slave_id
dmaengine: tegra20-apb: stop checking config->slave_id
ASoC: dai_dma: remove slave_id field
spi: pic32: stop setting dma_config->slave_id
mmc: bcm2835: stop setting chan_config->slave_id
dmaengine: shdma: remove legacy slave_id parsing
dmaengine: pxa/mmp: stop referencing config->slave_id
dmaengine: sprd: stop referencing config->slave_id
dmaengine: qcom-adm: stop abusing slave_id config
dmaengine: xilinx_dpdma: stop using slave_id field
dmaengine: remove slave_id config field
drivers/dma/mmp_pdma.c | 6 ------
drivers/dma/pxa_dma.c | 7 -------
drivers/dma/qcom/qcom_adm.c | 56
+++++++++++++++++++++++++++++++++++++++++++++++++-------
drivers/dma/sh/shdma-base.c | 8 --------
drivers/dma/sprd-dma.c | 3 ---
drivers/dma/tegra20-apb-dma.c | 6 ------
drivers/dma/xilinx/xilinx_dpdma.c | 17 +++++++++++------
drivers/gpu/drm/xlnx/zynqmp_disp.c | 9 +++++++--
drivers/mmc/host/bcm2835.c | 2 --
drivers/mtd/nand/raw/qcom_nandc.c | 14 ++++++++++++--
drivers/spi/spi-pic32.c | 2 --
drivers/tty/serial/msm_serial.c | 15 +++++++++++++--
include/linux/dma/qcom_adm.h | 12 ++++++++++++
include/linux/dma/xilinx_dpdma.h | 11 +++++++++++
include/linux/dmaengine.h | 4 ----
include/sound/dmaengine_pcm.h | 2 --
sound/core/pcm_dmaengine.c | 5 ++---
sound/soc/tegra/tegra20_spdif.c | 1 -
18 files changed, 117 insertions(+), 63 deletions(-)
create mode 100644 include/linux/dma/qcom_adm.h
create mode 100644 include/linux/dma/xilinx_dpdma.h
Thanks
--
~Vinod
signature.asc
Description: PGP signature
