tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

Mark Brown 84a5347b 449af266

+8
+4
sound/soc/codecs/rt5645.c
··· 1667 1667 RT5645_PWR_CLS_D_L, 1668 1668 RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | 1669 1669 RT5645_PWR_CLS_D_L); 1670 + snd_soc_update_bits(codec, RT5645_GEN_CTRL3, 1671 + RT5645_DET_CLK_MASK, RT5645_DET_CLK_MODE1); 1670 1672 break; 1671 1673 1672 1674 case SND_SOC_DAPM_PRE_PMD: 1675 + snd_soc_update_bits(codec, RT5645_GEN_CTRL3, 1676 + RT5645_DET_CLK_MASK, RT5645_DET_CLK_DIS); 1673 1677 snd_soc_write(codec, RT5645_EQ_CTRL2, 0); 1674 1678 snd_soc_update_bits(codec, RT5645_PWR_DIG1, 1675 1679 RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
+4
sound/soc/codecs/rt5645.h
··· 2122 2122 /* General Control3 (0xfc) */ 2123 2123 #define RT5645_JD_PSV_MODE (0x1 << 12) 2124 2124 #define RT5645_IRQ_CLK_GATE_CTRL (0x1 << 11) 2125 + #define RT5645_DET_CLK_MASK (0x3 << 9) 2126 + #define RT5645_DET_CLK_DIS (0x0 << 9) 2127 + #define RT5645_DET_CLK_MODE1 (0x1 << 9) 2128 + #define RT5645_DET_CLK_MODE2 (0x2 << 9) 2125 2129 #define RT5645_MICINDET_MANU (0x1 << 7) 2126 2130 #define RT5645_RING2_SLEEVE_GND (0x1 << 5) 2127 2131