Merge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec" (436eeda4) · Commits · e / devices / android_kernel_sony_msm8998

drivers/mfd/wcd9xxx-utils.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -265,8 +265,17 @@ static u32 wcd9xxx_validate_dmic_sample_rate(struct device *dev,
		__func__, div_factor, mclk_rate);
		break;
		case 6:
		/* DIV 6 is valid only for 12.288 MCLK */
		if (mclk_rate != WCD9XXX_MCLK_CLK_12P288MHZ)
		/*
		* DIV 6 is valid for both 9.6MHz and 12.288MHz
		* MCLK on Tavil. Older codecs support DIV6 only
		* for 12.288MHz MCLK.
		*/
		if ((mclk_rate == WCD9XXX_MCLK_CLK_9P6HZ) &&
		(of_device_is_compatible(dev->of_node,
		"qcom,tavil-slim-pgd")))
		dev_dbg(dev, "%s: DMIC_DIV = %u, mclk_rate = %u\n",
		__func__, div_factor, mclk_rate);
		else if (mclk_rate != WCD9XXX_MCLK_CLK_12P288MHZ)
		goto undefined_rate;
		break;
		default: