Unverified Commit e288179d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: DAI clocking terminology modernisation 

Merge series from Mark Brown <broonie@kernel.org>:

Update the last batch of CODEC drivers without specific
maintainers to use the new defines for DAI clocking.
parents 336a2d93 894bf75b

sound/soc/codecs/cx2072x.c

+7 −10
Original line number Diff line number Diff line
@@ -710,22 +710,19 @@ static int cx2072x_config_i2spcm(struct cx2072x_priv *cx2072x) 


	regdbt2.ulval = 0xac;



	/* set master/slave */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

		reg2.r.tx_master = 1;

		reg3.r.rx_master = 1;

		dev_dbg(dev, "Sets Master mode\n");

		break;



	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		reg2.r.tx_master = 0;

		reg3.r.rx_master = 0;

		dev_dbg(dev, "Sets Slave mode\n");

		break;



	default:

		dev_err(dev, "Unsupported DAI master mode\n");

		dev_err(dev, "Unsupported DAI clocking mode\n");

		return -EINVAL;

	}
@@ -1009,9 +1006,9 @@ static int cx2072x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 


	dev_dbg(dev, "set_dai_fmt- %08x\n", fmt);

	/* set master/slave */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

	case SND_SOC_DAIFMT_CBC_CFC:

		break;



	default:

sound/soc/codecs/max98090.c

+5 −7
Original line number Diff line number Diff line
@@ -1591,9 +1591,9 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, 
		cdata->fmt = fmt;



		regval = 0;

		switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

		case SND_SOC_DAIFMT_CBS_CFS:

			/* Set to slave mode PLL - MAS mode off */

		switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

		case SND_SOC_DAIFMT_CBC_CFC:

			/* Set to consumer mode PLL - MAS mode off */

			snd_soc_component_write(component,

				M98090_REG_CLOCK_RATIO_NI_MSB, 0x00);

			snd_soc_component_write(component,
@@ -1602,8 +1602,8 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, 
				M98090_USE_M1_MASK, 0);

			max98090->master = false;

			break;

		case SND_SOC_DAIFMT_CBM_CFM:

			/* Set to master mode */

		case SND_SOC_DAIFMT_CBP_CFP:

			/* Set to provider mode */

			if (max98090->tdm_slots == 4) {

				/* TDM */

				regval |= M98090_MAS_MASK |
@@ -1619,8 +1619,6 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, 
			}

			max98090->master = true;

			break;

		case SND_SOC_DAIFMT_CBS_CFM:

		case SND_SOC_DAIFMT_CBM_CFS:

		default:

			dev_err(component->dev, "DAI clock mode unsupported");

			return -EINVAL;

sound/soc/codecs/rk3328_codec.c

+3 −3
Original line number Diff line number Diff line
@@ -69,11 +69,11 @@ static int rk3328_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		snd_soc_component_get_drvdata(dai->component);

	unsigned int val;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBC_CFC:

		val = PIN_DIRECTION_IN | DAC_I2S_MODE_SLAVE;

		break;

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_CBP_CFP:

		val = PIN_DIRECTION_OUT | DAC_I2S_MODE_MASTER;

		break;

	default:

sound/soc/codecs/sta32x.c

+2 −2
Original line number Diff line number Diff line
@@ -601,8 +601,8 @@ static int sta32x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);

	u8 confb = 0;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBC_CFC:

		break;

	default:

		return -EINVAL;

sound/soc/codecs/sta350.c

+2 −2
Original line number Diff line number Diff line
@@ -630,8 +630,8 @@ static int sta350_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	struct sta350_priv *sta350 = snd_soc_component_get_drvdata(component);

	unsigned int confb = 0;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBC_CFC:

		break;

	default:

		return -EINVAL;