Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292d2497 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/rt5645' of... 

Merge branch 'topic/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
parents 26f63c69 177e1e1f

sound/soc/codecs/rt5645.c

+598 −104

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/rt5645.h

+15 −13
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define RT5645_TDM_CTRL_1			0x77

#define RT5645_TDM_CTRL_2			0x78

#define RT5645_TDM_CTRL_3			0x79

#define RT5650_TDM_CTRL_4			0x7a



/* Function - Analog */

#define RT5645_GLB_CLK				0x80
@@ -942,10 +943,6 @@ 
#define RT5645_I2S2_SDI_I2S2			(0x1 << 6)



/* ADC/DAC Clock Control 1 (0x73) */

#define RT5645_I2S_BCLK_MS1_MASK		(0x1 << 15)

#define RT5645_I2S_BCLK_MS1_SFT			15

#define RT5645_I2S_BCLK_MS1_32			(0x0 << 15)

#define RT5645_I2S_BCLK_MS1_64			(0x1 << 15)

#define RT5645_I2S_PD1_MASK			(0x7 << 12)

#define RT5645_I2S_PD1_SFT			12

#define RT5645_I2S_PD1_1			(0x0 << 12)
@@ -1067,13 +1064,14 @@ 
#define RT5645_SCLK_SRC_SFT			14

#define RT5645_SCLK_SRC_MCLK			(0x0 << 14)

#define RT5645_SCLK_SRC_PLL1			(0x1 << 14)

#define RT5645_SCLK_SRC_RCCLK			(0x2 << 14) /* 15MHz */

#define RT5645_PLL1_SRC_MASK			(0x3 << 12)

#define RT5645_PLL1_SRC_SFT			12

#define RT5645_PLL1_SRC_MCLK			(0x0 << 12)

#define RT5645_PLL1_SRC_BCLK1			(0x1 << 12)

#define RT5645_PLL1_SRC_BCLK2			(0x2 << 12)

#define RT5645_PLL1_SRC_BCLK3			(0x3 << 12)

#define RT5645_SCLK_SRC_RCCLK			(0x2 << 14)

#define RT5645_PLL1_SRC_MASK			(0x7 << 11)

#define RT5645_PLL1_SRC_SFT			11

#define RT5645_PLL1_SRC_MCLK			(0x0 << 11)

#define RT5645_PLL1_SRC_BCLK1			(0x1 << 11)

#define RT5645_PLL1_SRC_BCLK2			(0x2 << 11)

#define RT5645_PLL1_SRC_BCLK3			(0x3 << 11)

#define RT5645_PLL1_SRC_RCCLK			(0x4 << 11)

#define RT5645_PLL1_PD_MASK			(0x1 << 3)

#define RT5645_PLL1_PD_SFT			3

#define RT5645_PLL1_PD_1			(0x0 << 3)
@@ -2184,6 +2182,7 @@ struct rt5645_priv { 
	struct i2c_client *i2c;

	struct snd_soc_jack *hp_jack;

	struct snd_soc_jack *mic_jack;

	struct snd_soc_jack *btn_jack;

	struct delayed_work jack_detect_work;



	int codec_type;
@@ -2196,9 +2195,12 @@ struct rt5645_priv { 
	int pll_src;

	int pll_in;

	int pll_out;



	int jack_type;

	bool en_button_func;

};



int rt5645_set_jack_detect(struct snd_soc_codec *codec,

	struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack);



	struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack,

	struct snd_soc_jack *btn_jack);

#endif /* __RT5645_H__ */

sound/soc/intel/boards/cht_bsw_rt5645.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) 
		return ret;

	}



	rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack);

	rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL);



	return ret;

}