Commit bc4efdb6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/rt5677' into asoc-next

parents 83652a39 2dfadff6

sound/soc/codecs/rt5677.c

+5 −19
Original line number Original line Diff line number Diff line
@@ -1241,60 +1241,46 @@ static int rt5677_dmic_use_asrc(struct snd_soc_dapm_widget *source, 
		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_STO1_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_STO1_CLK_SEL_MASK) >>

				RT5677_AD_STO1_CLK_SEL_SFT;

				RT5677_AD_STO1_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	case 10:

	case 10:

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_STO2_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_STO2_CLK_SEL_MASK) >>

				RT5677_AD_STO2_CLK_SEL_SFT;

				RT5677_AD_STO2_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	case 9:

	case 9:

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_STO3_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_STO3_CLK_SEL_MASK) >>

				RT5677_AD_STO3_CLK_SEL_SFT;

				RT5677_AD_STO3_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	case 8:

	case 8:

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_STO4_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_STO4_CLK_SEL_MASK) >>

			RT5677_AD_STO4_CLK_SEL_SFT;

			RT5677_AD_STO4_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	case 7:

	case 7:

		regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_MONOL_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_MONOL_CLK_SEL_MASK) >>

			RT5677_AD_MONOL_CLK_SEL_SFT;

			RT5677_AD_MONOL_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	case 6:

	case 6:

		regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);

		regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);

		asrc_setting = (asrc_setting & RT5677_AD_MONOR_CLK_SEL_MASK) >>

		asrc_setting = (asrc_setting & RT5677_AD_MONOR_CLK_SEL_MASK) >>

			RT5677_AD_MONOR_CLK_SEL_SFT;

			RT5677_AD_MONOR_CLK_SEL_SFT;

		if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

			asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

			return 1;

		break;

		break;





	default:

	default:

		break;

		return 0;

	}

	}





	if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&

	    asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)

		return 1;



	return 0;

	return 0;

}

}