Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus (7a7ef5b9) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/soc/sh/rcar/adg.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -507,7 +507,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
		rbga = rbgx;
		adg->rbga_rate_for_441khz = rate / div;
		ckr \|= brg_table[i] << 20;
		if (req_441kHz_rate)
		if (req_441kHz_rate &&
		!(adg_mode_flags(adg) & AUDIO_OUT_48))
		parent_clk_name = __clk_get_name(clk);
		}
		}
		@@ -522,7 +523,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
		rbgb = rbgx;
		adg->rbgb_rate_for_48khz = rate / div;
		ckr \|= brg_table[i] << 16;
		if (req_48kHz_rate)
		if (req_48kHz_rate &&
		(adg_mode_flags(adg) & AUDIO_OUT_48))
		parent_clk_name = __clk_get_name(clk);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
		dev_dbg(dev, "ctu/mix path = 0x%08x", data);

		rsnd_mod_write(mod, CMD_ROUTE_SLCT, data);
		rsnd_mod_write(mod, CMD_BUSIF_MODE, rsnd_get_busif_shift(io, mod) \| 1);
		rsnd_mod_write(mod, CMD_BUSIF_DALIGN, rsnd_get_dalign(mod, io));

		rsnd_adg_set_cmd_timsel_gen2(mod, io);

+51 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,57 @@ u32 rsnd_get_dalign(struct rsnd_mod mod, struct rsnd_dai_stream io)
		return 0x76543210;
		}

		u32 rsnd_get_busif_shift(struct rsnd_dai_stream io, struct rsnd_mod mod)
		{
		enum rsnd_mod_type playback_mods[] = {
		RSND_MOD_SRC,
		RSND_MOD_CMD,
		RSND_MOD_SSIU,
		};
		enum rsnd_mod_type capture_mods[] = {
		RSND_MOD_CMD,
		RSND_MOD_SRC,
		RSND_MOD_SSIU,
		};
		struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
		struct rsnd_mod *tmod = NULL;
		enum rsnd_mod_type *mods =
		rsnd_io_is_play(io) ?
		playback_mods : capture_mods;
		int i;

		/*
		* This is needed for 24bit data
		* We need to shift 8bit
		*
		* Linux 24bit data is located as 0x00******
		* HW 24bit data is located as 0x******00
		*
		*/
		switch (runtime->sample_bits) {
		case 16:
		return 0;
		case 32:
		break;
		}

		for (i = 0; i < ARRAY_SIZE(playback_mods); i++) {
		tmod = rsnd_io_to_mod(io, mods[i]);
		if (tmod)
		break;
		}

		if (tmod != mod)
		return 0;

		if (rsnd_io_is_play(io))
		return (0 << 20) \| /* shift to Left */
		(8 << 16); /* 8bit */
		else
		return (1 << 20) \| /* shift to Right */
		(8 << 16); /* 8bit */
		}

		/*
		* rsnd_dai functions
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
		RSND_GEN_M_REG(SRC_ROUTE_MODE0, 0xc, 0x20),
		RSND_GEN_M_REG(SRC_CTRL, 0x10, 0x20),
		RSND_GEN_M_REG(SRC_INT_ENABLE0, 0x18, 0x20),
		RSND_GEN_M_REG(CMD_BUSIF_MODE, 0x184, 0x20),
		RSND_GEN_M_REG(CMD_BUSIF_DALIGN,0x188, 0x20),
		RSND_GEN_M_REG(CMD_ROUTE_SLCT, 0x18c, 0x20),
		RSND_GEN_M_REG(CMD_CTRL, 0x190, 0x20),

+2 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ enum rsnd_reg {
		RSND_REG_SCU_SYS_INT_EN0,
		RSND_REG_SCU_SYS_INT_EN1,
		RSND_REG_CMD_CTRL,
		RSND_REG_CMD_BUSIF_MODE,
		RSND_REG_CMD_BUSIF_DALIGN,
		RSND_REG_CMD_ROUTE_SLCT,
		RSND_REG_CMDOUT_TIMSEL,
		@@ -204,6 +205,7 @@ void rsnd_bset(struct rsnd_priv priv, struct rsnd_mod mod, enum rsnd_reg reg,
		u32 mask, u32 data);
		u32 rsnd_get_adinr_bit(struct rsnd_mod mod, struct rsnd_dai_stream io);
		u32 rsnd_get_dalign(struct rsnd_mod mod, struct rsnd_dai_stream io);
		u32 rsnd_get_busif_shift(struct rsnd_dai_stream io, struct rsnd_mod mod);

		/*
		* R-Car DMA