Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus (d1c46ef8) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/sh/rcar/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,6 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma,
		for (i = 1; i < MOD_MAX; i++) {
		if (!src) {
		mod[i] = ssi;
		break;
		} else if (!dvc) {
		mod[i] = src;
		src = NULL;
		@@ -308,6 +307,9 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma,

		if (mod[i] == this)
		index = i;

		if (mod[i] == ssi)
		break;
		}

		if (is_play) {

sound/soc/sh/rcar/gen.c

+21 −12

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ static int rsnd_gen_regmap_init(struct rsnd_priv *priv,
		#define RDMA_CMD_O_N(addr, i) (addr ##_reg - 0x004f8000 + (0x400 * i))
		#define RDMA_CMD_O_P(addr, i) (addr ##_reg - 0x001f8000 + (0x400 * i))

		void rsnd_gen_dma_addr(struct rsnd_priv *priv,
		static void rsnd_gen2_dma_addr(struct rsnd_priv *priv,
		struct rsnd_dma *dma,
		struct dma_slave_config *cfg,
		int is_play, int slave_id)
		@@ -226,6 +226,24 @@ void rsnd_gen_dma_addr(struct rsnd_priv *priv,
		}
		};

		/* it shouldn't happen */
		if (use_dvc & !use_src) {
		dev_err(dev, "DVC is selected without SRC\n");
		return;
		}

		cfg->src_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].src_addr;
		cfg->dst_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].dst_addr;

		dev_dbg(dev, "dma%d addr - src : %x / dst : %x\n",
		id, cfg->src_addr, cfg->dst_addr);
		}

		void rsnd_gen_dma_addr(struct rsnd_priv *priv,
		struct rsnd_dma *dma,
		struct dma_slave_config *cfg,
		int is_play, int slave_id)
		{
		cfg->slave_id = slave_id;
		cfg->src_addr = 0;
		cfg->dst_addr = 0;
		@@ -237,18 +255,9 @@ void rsnd_gen_dma_addr(struct rsnd_priv *priv,
		if (rsnd_is_gen1(priv))
		return;

		/* it shouldn't happen */
		if (use_dvc & !use_src) {
		dev_err(dev, "DVC is selected without SRC\n");
		return;
		rsnd_gen2_dma_addr(priv, dma, cfg, is_play, slave_id);
		}

		cfg->src_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].src_addr;
		cfg->dst_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].dst_addr;

		dev_dbg(dev, "dma%d addr - src : %x / dst : %x\n",
		id, cfg->src_addr, cfg->dst_addr);
		}

		/*
		* Gen2