ASoC: codecs: ES8326
Merge series from Zhu Ning <zhuning0077@gmail.com>: We developed a new version of the chip. 3 Three patches are used for compatibility with the old and new versions of the chip.We did tests with the new driver at version_v0 and version_v3.The test results from the test department met our expectations.Both versions work well with the new drivers.
This commit is contained in:
Mark Brown
commit
0a59f2415b
229
sound/soc/codecs/es8326.c
Normal file → Executable file
229
sound/soc/codecs/es8326.c
Normal file → Executable file
@ -132,6 +132,11 @@ static const struct snd_soc_dapm_widget es8326_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_PGA("LHPMIX", ES8326_DAC2HPMIX, 7, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("RHPMIX", ES8326_DAC2HPMIX, 3, 0, NULL, 0),
|
||||
|
||||
SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPOR Supply", ES8326_HP_CAL,
|
||||
4, 7, 0, 0),
|
||||
SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPOL Supply", ES8326_HP_CAL,
|
||||
0, 7, 0, 0),
|
||||
|
||||
SND_SOC_DAPM_OUTPUT("HPOL"),
|
||||
SND_SOC_DAPM_OUTPUT("HPOR"),
|
||||
};
|
||||
@ -156,6 +161,9 @@ static const struct snd_soc_dapm_route es8326_dapm_routes[] = {
|
||||
{"LHPMIX", NULL, "Left DAC"},
|
||||
{"RHPMIX", NULL, "Right DAC"},
|
||||
|
||||
{"HPOR", NULL, "HPOR Supply"},
|
||||
{"HPOL", NULL, "HPOL Supply"},
|
||||
|
||||
{"HPOL", NULL, "LHPMIX"},
|
||||
{"HPOR", NULL, "RHPMIX"},
|
||||
};
|
||||
@ -198,77 +206,108 @@ struct _coeff_div {
|
||||
|
||||
/* codec hifi mclk clock divider coefficients */
|
||||
/* {ratio, LRCK, MCLK, REG04, REG05, REG06, REG07, REG08, REG09, REG10, REG11} */
|
||||
static const struct _coeff_div coeff_div[] = {
|
||||
{32, 8000, 256000, 0x60, 0x00, 0x0F, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{32, 16000, 512000, 0x20, 0x00, 0x0D, 0x75, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{32, 44100, 1411200, 0x00, 0x00, 0x13, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{32, 48000, 1536000, 0x00, 0x00, 0x13, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{36, 8000, 288000, 0x20, 0x00, 0x0D, 0x75, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{36, 16000, 576000, 0x20, 0x00, 0x0D, 0x75, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{48, 8000, 384000, 0x60, 0x02, 0x1F, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{48, 16000, 768000, 0x20, 0x02, 0x0F, 0x75, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{48, 48000, 2304000, 0x00, 0x02, 0x0D, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{64, 8000, 512000, 0x60, 0x00, 0x0D, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{64, 16000, 1024000, 0x20, 0x00, 0x05, 0x75, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
static const struct _coeff_div coeff_div_v0[] = {
|
||||
{64, 8000, 512000, 0x60, 0x01, 0x0F, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{64, 16000, 1024000, 0x20, 0x00, 0x33, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{64, 44100, 2822400, 0xE0, 0x00, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{64, 48000, 3072000, 0xE0, 0x00, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{128, 8000, 1024000, 0x60, 0x00, 0x33, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{128, 16000, 2048000, 0x20, 0x00, 0x03, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{128, 44100, 5644800, 0xE0, 0x01, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{128, 48000, 6144000, 0xE0, 0x01, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
|
||||
{64, 44100, 2822400, 0x00, 0x00, 0x11, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{64, 48000, 3072000, 0x00, 0x00, 0x11, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{72, 8000, 576000, 0x20, 0x00, 0x13, 0x35, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{72, 16000, 1152000, 0x20, 0x00, 0x05, 0x75, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{96, 8000, 768000, 0x60, 0x02, 0x1D, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{96, 16000, 1536000, 0x20, 0x02, 0x0D, 0x75, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{100, 48000, 4800000, 0x04, 0x04, 0x3F, 0x6D, 0x38, 0x08, 0x4f, 0x1f},
|
||||
{125, 48000, 6000000, 0x04, 0x04, 0x1F, 0x2D, 0x0A, 0x0A, 0x27, 0x27},
|
||||
{128, 8000, 1024000, 0x60, 0x00, 0x13, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{128, 16000, 2048000, 0x20, 0x00, 0x11, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{192, 32000, 6144000, 0xE0, 0x02, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{256, 8000, 2048000, 0x60, 0x00, 0x03, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{256, 16000, 4096000, 0x20, 0x01, 0x03, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{256, 44100, 11289600, 0xE0, 0x00, 0x30, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{256, 48000, 12288000, 0xE0, 0x00, 0x30, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{384, 32000, 12288000, 0xE0, 0x05, 0x03, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{400, 48000, 19200000, 0xE9, 0x04, 0x0F, 0x6d, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
|
||||
{128, 44100, 5644800, 0x00, 0x00, 0x01, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{128, 48000, 6144000, 0x00, 0x00, 0x01, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{144, 8000, 1152000, 0x20, 0x00, 0x03, 0x35, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{144, 16000, 2304000, 0x20, 0x00, 0x11, 0x35, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{192, 8000, 1536000, 0x60, 0x02, 0x0D, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{192, 16000, 3072000, 0x20, 0x02, 0x05, 0x75, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{200, 48000, 9600000, 0x04, 0x04, 0x0F, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{250, 48000, 12000000, 0x04, 0x04, 0x0F, 0x2D, 0x0A, 0x0A, 0x27, 0x27},
|
||||
{256, 8000, 2048000, 0x60, 0x00, 0x11, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{256, 16000, 4096000, 0x20, 0x00, 0x01, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
|
||||
{256, 44100, 11289600, 0x00, 0x00, 0x10, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{256, 48000, 12288000, 0x00, 0x00, 0x30, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{288, 8000, 2304000, 0x20, 0x00, 0x01, 0x35, 0x0A, 0x1B, 0x23, 0x47},
|
||||
{384, 8000, 3072000, 0x60, 0x02, 0x05, 0x75, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{384, 16000, 6144000, 0x20, 0x02, 0x03, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{384, 48000, 18432000, 0x00, 0x02, 0x01, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{400, 48000, 19200000, 0x09, 0x04, 0x0f, 0x6d, 0x3a, 0x0A, 0x4F, 0x1F},
|
||||
{500, 48000, 24000000, 0x18, 0x04, 0x1F, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{512, 8000, 4096000, 0x60, 0x00, 0x01, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{512, 16000, 8192000, 0x20, 0x00, 0x10, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
|
||||
{512, 44100, 22579200, 0x00, 0x00, 0x00, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{512, 48000, 24576000, 0x00, 0x00, 0x00, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{768, 8000, 6144000, 0x60, 0x02, 0x11, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{768, 16000, 12288000, 0x20, 0x02, 0x01, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{800, 48000, 38400000, 0x00, 0x18, 0x13, 0x2D, 0x0A, 0x0A, 0x1F, 0x1F},
|
||||
{1024, 8000, 8192000, 0x60, 0x00, 0x10, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{500, 48000, 24000000, 0xF8, 0x04, 0x3F, 0x6D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{512, 8000, 4096000, 0x60, 0x01, 0x03, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{512, 16000, 8192000, 0x20, 0x00, 0x30, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{512, 44100, 22579200, 0xE0, 0x00, 0x00, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{512, 48000, 24576000, 0xE0, 0x00, 0x00, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{768, 32000, 24576000, 0xE0, 0x02, 0x30, 0x2D, 0x4A, 0x0A, 0x1F, 0x1F},
|
||||
{1024, 8000, 8192000, 0x60, 0x00, 0x30, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{1024, 16000, 16384000, 0x20, 0x00, 0x00, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{1152, 16000, 18432000, 0x20, 0x08, 0x11, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{1536, 8000, 12288000, 0x60, 0x02, 0x01, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
|
||||
{1536, 16000, 24576000, 0x20, 0x02, 0x10, 0x35, 0x0A, 0x1B, 0x1F, 0x3F},
|
||||
{1625, 8000, 13000000, 0x0C, 0x18, 0x1F, 0x2D, 0x0A, 0x0A, 0x27, 0x27},
|
||||
{1625, 16000, 26000000, 0x0C, 0x18, 0x1F, 0x2D, 0x0A, 0x0A, 0x27, 0x27},
|
||||
{2048, 8000, 16384000, 0x60, 0x00, 0x00, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{2304, 8000, 18432000, 0x40, 0x02, 0x10, 0x35, 0x0A, 0x1B, 0x1F, 0x5F},
|
||||
{3072, 8000, 24576000, 0x60, 0x02, 0x10, 0x35, 0x0A, 0x1B, 0x1F, 0x7F},
|
||||
{3250, 8000, 26000000, 0x0C, 0x18, 0x0F, 0x2D, 0x0A, 0x0A, 0x27, 0x27},
|
||||
|
||||
};
|
||||
|
||||
static inline int get_coeff(int mclk, int rate)
|
||||
static const struct _coeff_div coeff_div_v3[] = {
|
||||
{32, 8000, 256000, 0x60, 0x00, 0x0F, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{32, 16000, 512000, 0x20, 0x00, 0x0D, 0x75, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{32, 44100, 1411200, 0x00, 0x00, 0x13, 0x2D, 0x8A, 0x0A, 0x1F, 0x1F},
|
||||
{32, 48000, 1536000, 0x00, 0x00, 0x13, 0x2D, 0x8A, 0x0A, 0x1F, 0x1F},
|
||||
{36, 8000, 288000, 0x20, 0x00, 0x0D, 0x75, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{36, 16000, 576000, 0x20, 0x00, 0x0D, 0x75, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{48, 8000, 384000, 0x60, 0x02, 0x1F, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{48, 16000, 768000, 0x20, 0x02, 0x0F, 0x75, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{48, 48000, 2304000, 0x00, 0x02, 0x0D, 0x2D, 0x8A, 0x0A, 0x1F, 0x1F},
|
||||
|
||||
{64, 8000, 512000, 0x60, 0x00, 0x35, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{64, 16000, 1024000, 0x20, 0x00, 0x05, 0x75, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{64, 44100, 2822400, 0xE0, 0x00, 0x31, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{64, 48000, 3072000, 0xE0, 0x00, 0x31, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{72, 8000, 576000, 0x20, 0x00, 0x13, 0x35, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{72, 16000, 1152000, 0x20, 0x00, 0x05, 0x75, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{96, 8000, 768000, 0x60, 0x02, 0x1D, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{96, 16000, 1536000, 0x20, 0x02, 0x0D, 0x75, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{100, 48000, 4800000, 0x04, 0x04, 0x3F, 0x6D, 0xB8, 0x08, 0x4f, 0x1f},
|
||||
{125, 48000, 6000000, 0x04, 0x04, 0x1F, 0x2D, 0x8A, 0x0A, 0x27, 0x27},
|
||||
|
||||
{128, 8000, 1024000, 0x60, 0x00, 0x05, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{128, 16000, 2048000, 0x20, 0x00, 0x31, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{128, 44100, 5644800, 0xE0, 0x00, 0x01, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{128, 48000, 6144000, 0xE0, 0x00, 0x01, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{144, 8000, 1152000, 0x20, 0x00, 0x03, 0x35, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{144, 16000, 2304000, 0x20, 0x00, 0x11, 0x35, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{192, 8000, 1536000, 0x60, 0x02, 0x0D, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{192, 32000, 6144000, 0xE0, 0x02, 0x31, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{192, 16000, 3072000, 0x20, 0x02, 0x05, 0x75, 0xCA, 0x1B, 0x1F, 0x3F},
|
||||
|
||||
{200, 48000, 9600000, 0x04, 0x04, 0x0F, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{250, 48000, 12000000, 0x04, 0x04, 0x0F, 0x2D, 0xCA, 0x0A, 0x27, 0x27},
|
||||
{256, 8000, 2048000, 0x60, 0x00, 0x31, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{256, 16000, 4096000, 0x20, 0x00, 0x01, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{256, 44100, 11289600, 0xE0, 0x00, 0x30, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{256, 48000, 12288000, 0xE0, 0x00, 0x30, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{288, 8000, 2304000, 0x20, 0x00, 0x01, 0x35, 0x8A, 0x1B, 0x23, 0x47},
|
||||
{384, 8000, 3072000, 0x60, 0x02, 0x05, 0x75, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{384, 16000, 6144000, 0x20, 0x02, 0x03, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{384, 32000, 12288000, 0xE0, 0x02, 0x01, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{384, 48000, 18432000, 0x00, 0x02, 0x01, 0x2D, 0x8A, 0x0A, 0x1F, 0x1F},
|
||||
|
||||
{400, 48000, 19200000, 0xE4, 0x04, 0x35, 0x6d, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{500, 48000, 24000000, 0xF8, 0x04, 0x3F, 0x6D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{512, 8000, 4096000, 0x60, 0x00, 0x01, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{512, 16000, 8192000, 0x20, 0x00, 0x30, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{512, 44100, 22579200, 0xE0, 0x00, 0x00, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{512, 48000, 24576000, 0xE0, 0x00, 0x00, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{768, 8000, 6144000, 0x60, 0x02, 0x11, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{768, 16000, 12288000, 0x20, 0x02, 0x01, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{768, 32000, 24576000, 0xE0, 0x02, 0x30, 0x2D, 0xCA, 0x0A, 0x1F, 0x1F},
|
||||
{800, 48000, 38400000, 0x00, 0x18, 0x13, 0x2D, 0x8A, 0x0A, 0x1F, 0x1F},
|
||||
|
||||
{1024, 8000, 8192000, 0x60, 0x00, 0x30, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{1024, 16000, 16384000, 0x20, 0x00, 0x00, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{1152, 16000, 18432000, 0x20, 0x08, 0x11, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{1536, 8000, 12288000, 0x60, 0x02, 0x01, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{1536, 16000, 24576000, 0x20, 0x02, 0x10, 0x35, 0x8A, 0x1B, 0x1F, 0x3F},
|
||||
{1625, 8000, 13000000, 0x0C, 0x18, 0x1F, 0x2D, 0x8A, 0x0A, 0x27, 0x27},
|
||||
{1625, 16000, 26000000, 0x0C, 0x18, 0x1F, 0x2D, 0x8A, 0x0A, 0x27, 0x27},
|
||||
{2048, 8000, 16384000, 0x60, 0x00, 0x00, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{2304, 8000, 18432000, 0x40, 0x02, 0x10, 0x35, 0x8A, 0x1B, 0x1F, 0x5F},
|
||||
{3072, 8000, 24576000, 0x60, 0x02, 0x10, 0x35, 0x8A, 0x1B, 0x1F, 0x7F},
|
||||
{3250, 8000, 26000000, 0x0C, 0x18, 0x0F, 0x2D, 0x8A, 0x0A, 0x27, 0x27},
|
||||
};
|
||||
|
||||
static inline int get_coeff(int mclk, int rate, int array,
|
||||
const struct _coeff_div *coeff_div)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(coeff_div); i++) {
|
||||
for (i = 0; i < array; i++) {
|
||||
if (coeff_div[i].rate == rate && coeff_div[i].mclk == mclk)
|
||||
return i;
|
||||
}
|
||||
@ -333,11 +372,19 @@ static int es8326_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_component *component = dai->component;
|
||||
const struct _coeff_div *coeff_div;
|
||||
struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component);
|
||||
u8 srate = 0;
|
||||
int coeff;
|
||||
int coeff, array;
|
||||
|
||||
coeff = get_coeff(es8326->sysclk, params_rate(params));
|
||||
if (es8326->version == 0) {
|
||||
coeff_div = coeff_div_v0;
|
||||
array = ARRAY_SIZE(coeff_div_v0);
|
||||
} else {
|
||||
coeff_div = coeff_div_v3;
|
||||
array = ARRAY_SIZE(coeff_div_v3);
|
||||
}
|
||||
coeff = get_coeff(es8326->sysclk, params_rate(params), array, coeff_div);
|
||||
/* bit size */
|
||||
switch (params_format(params)) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
@ -409,8 +456,8 @@ static int es8326_mute(struct snd_soc_dai *dai, int mute, int direction)
|
||||
regmap_write(es8326->regmap, ES8326_HPR_OFFSET_INI, offset_r);
|
||||
es8326->calibrated = true;
|
||||
}
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa0);
|
||||
regmap_write(es8326->regmap, ES8326_HP_VOL, 0x80);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa1);
|
||||
regmap_write(es8326->regmap, ES8326_HP_VOL, 0x91);
|
||||
regmap_write(es8326->regmap, ES8326_HP_CAL, ES8326_HP_ON);
|
||||
regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE,
|
||||
ES8326_MUTE_MASK, ~(ES8326_MUTE));
|
||||
@ -430,8 +477,6 @@ static int es8326_set_bias_level(struct snd_soc_component *codec,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
regmap_write(es8326->regmap, ES8326_RESET, 0x9f);
|
||||
msleep(20);
|
||||
regmap_update_bits(es8326->regmap, ES8326_DAC_DSM, 0x01, 0x00);
|
||||
regmap_write(es8326->regmap, ES8326_INTOUT_IO, es8326->interrupt_clk);
|
||||
regmap_write(es8326->regmap, ES8326_SDINOUT1_IO,
|
||||
@ -440,19 +485,21 @@ static int es8326_set_bias_level(struct snd_soc_component *codec,
|
||||
regmap_write(es8326->regmap, ES8326_PGA_PDN, 0x40);
|
||||
regmap_write(es8326->regmap, ES8326_ANA_PDN, 0x00);
|
||||
regmap_update_bits(es8326->regmap, ES8326_CLK_CTL, 0x20, 0x20);
|
||||
regmap_write(es8326->regmap, ES8326_RESET, ES8326_CSM_ON);
|
||||
|
||||
regmap_update_bits(es8326->regmap, ES8326_RESET,
|
||||
ES8326_CSM_ON, ES8326_CSM_ON);
|
||||
break;
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
break;
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
break;
|
||||
case SND_SOC_BIAS_OFF:
|
||||
clk_disable_unprepare(es8326->mclk);
|
||||
regmap_write(es8326->regmap, ES8326_ANA_PDN, 0x3b);
|
||||
regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x00);
|
||||
regmap_update_bits(es8326->regmap, ES8326_CLK_CTL, 0x20, 0x00);
|
||||
regmap_write(es8326->regmap, ES8326_SDINOUT1_IO, ES8326_IO_INPUT);
|
||||
break;
|
||||
case SND_SOC_BIAS_OFF:
|
||||
clk_disable_unprepare(es8326->mclk);
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -594,7 +641,7 @@ static void es8326_jack_detect_handler(struct work_struct *work)
|
||||
iface = snd_soc_component_read(comp, ES8326_HPDET_STA);
|
||||
dev_dbg(comp->dev, "gpio flag %#04x", iface);
|
||||
|
||||
if (es8326->jack_remove_retry == 1) {
|
||||
if ((es8326->jack_remove_retry == 1) && (es8326->version != ES8326_VERSION_B)) {
|
||||
if (iface & ES8326_HPINSERT_FLAG)
|
||||
es8326->jack_remove_retry = 2;
|
||||
else
|
||||
@ -628,7 +675,7 @@ static void es8326_jack_detect_handler(struct work_struct *work)
|
||||
/*
|
||||
* Inverted HPJACK_POL bit to trigger one IRQ to double check HP Removal event
|
||||
*/
|
||||
if (es8326->jack_remove_retry == 0) {
|
||||
if ((es8326->jack_remove_retry == 0) && (es8326->version != ES8326_VERSION_B)) {
|
||||
es8326->jack_remove_retry = 1;
|
||||
dev_dbg(comp->dev, "remove event check, invert HPJACK_POL, cnt = %d\n",
|
||||
es8326->jack_remove_retry);
|
||||
@ -644,14 +691,14 @@ static void es8326_jack_detect_handler(struct work_struct *work)
|
||||
if (es8326->hp == 0) {
|
||||
dev_dbg(comp->dev, "First insert, start OMTP/CTIA type check\n");
|
||||
/*
|
||||
* set auto-check mode, then restart jack_detect_work after 100ms.
|
||||
* set auto-check mode, then restart jack_detect_work after 400ms.
|
||||
* Don't report jack status.
|
||||
*/
|
||||
regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x01);
|
||||
usleep_range(50000, 70000);
|
||||
regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x00);
|
||||
queue_delayed_work(system_wq, &es8326->jack_detect_work,
|
||||
msecs_to_jiffies(100));
|
||||
msecs_to_jiffies(400));
|
||||
es8326->hp = 1;
|
||||
goto exit;
|
||||
}
|
||||
@ -701,7 +748,7 @@ static irqreturn_t es8326_irq(int irq, void *dev_id)
|
||||
msecs_to_jiffies(10));
|
||||
else
|
||||
queue_delayed_work(system_wq, &es8326->jack_detect_work,
|
||||
msecs_to_jiffies(600));
|
||||
msecs_to_jiffies(300));
|
||||
|
||||
out:
|
||||
return IRQ_HANDLED;
|
||||
@ -722,13 +769,15 @@ static int es8326_calibrate(struct snd_soc_component *component)
|
||||
regmap_write(es8326->regmap, ES8326_CLK_DIV1, 0x01);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_DLL, 0x30);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_MUX, 0xed);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_DAC_SEL, 0x08);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_TRI, 0xc1);
|
||||
regmap_write(es8326->regmap, ES8326_DAC_MUTE, 0x03);
|
||||
regmap_write(es8326->regmap, ES8326_ANA_VSEL, 0x7f);
|
||||
regmap_write(es8326->regmap, ES8326_VMIDLOW, 0x33);
|
||||
regmap_write(es8326->regmap, ES8326_VMIDLOW, 0x03);
|
||||
regmap_write(es8326->regmap, ES8326_DAC2HPMIX, 0x88);
|
||||
regmap_write(es8326->regmap, ES8326_HP_VOL, 0x80);
|
||||
usleep_range(15000, 20000);
|
||||
regmap_write(es8326->regmap, ES8326_HP_OFFSET_CAL, 0x8c);
|
||||
usleep_range(15000, 20000);
|
||||
regmap_write(es8326->regmap, ES8326_RESET, 0xc0);
|
||||
usleep_range(15000, 20000);
|
||||
|
||||
@ -766,27 +815,27 @@ static int es8326_resume(struct snd_soc_component *component)
|
||||
regmap_write(es8326->regmap, ES8326_RESET, 0x1f);
|
||||
regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x0E);
|
||||
usleep_range(10000, 15000);
|
||||
regmap_write(es8326->regmap, ES8326_HPJACK_TIMER, 0x88);
|
||||
regmap_write(es8326->regmap, ES8326_HPJACK_TIMER, 0xe9);
|
||||
regmap_write(es8326->regmap, ES8326_ANA_MICBIAS, 0x4b);
|
||||
/* set headphone default type and detect pin */
|
||||
regmap_write(es8326->regmap, ES8326_HPDET_TYPE, 0x81);
|
||||
regmap_write(es8326->regmap, ES8326_HPDET_TYPE, 0x83);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_RESAMPLE, 0x05);
|
||||
regmap_write(es8326->regmap, ES8326_HP_MISC, 0x30);
|
||||
|
||||
/* set internal oscillator as clock source of headpone cp */
|
||||
regmap_write(es8326->regmap, ES8326_CLK_DIV_CPC, 0x84);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_DIV_CPC, 0x89);
|
||||
regmap_write(es8326->regmap, ES8326_CLK_CTL, ES8326_CLK_ON);
|
||||
/* clock manager reset release */
|
||||
regmap_write(es8326->regmap, ES8326_RESET, 0x17);
|
||||
/* set headphone detection as half scan mode */
|
||||
regmap_write(es8326->regmap, ES8326_HP_MISC, 0x08);
|
||||
regmap_write(es8326->regmap, ES8326_HP_MISC, 0x30);
|
||||
regmap_write(es8326->regmap, ES8326_PULLUP_CTL, 0x00);
|
||||
|
||||
/* enable headphone driver */
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa7);
|
||||
usleep_range(2000, 5000);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER_REF, 0xab);
|
||||
usleep_range(2000, 5000);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER_REF, 0xbb);
|
||||
usleep_range(2000, 5000);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER_REF, 0xa3);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER_REF, 0xb3);
|
||||
regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa1);
|
||||
|
||||
regmap_write(es8326->regmap, ES8326_CLK_INV, 0x00);
|
||||
@ -800,9 +849,6 @@ static int es8326_resume(struct snd_soc_component *component)
|
||||
/* set ADC and DAC in low power mode */
|
||||
regmap_write(es8326->regmap, ES8326_ANA_LP, 0xf0);
|
||||
|
||||
/* force micbias on */
|
||||
regmap_write(es8326->regmap, ES8326_ANA_MICBIAS, 0x4f);
|
||||
regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x08);
|
||||
regmap_write(es8326->regmap, ES8326_ANA_VSEL, 0x7F);
|
||||
/* select vdda as micbias source */
|
||||
regmap_write(es8326->regmap, ES8326_VMIDLOW, 0x23);
|
||||
@ -830,6 +876,7 @@ static int es8326_resume(struct snd_soc_component *component)
|
||||
((es8326->version == ES8326_VERSION_B) ?
|
||||
(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol) :
|
||||
(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol | 0x04)));
|
||||
regmap_write(es8326->regmap, ES8326_HP_VOL, 0x11);
|
||||
|
||||
es8326->jack_remove_retry = 0;
|
||||
es8326->hp = 0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user