diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:03 +0100 |
| commit | 192664528154a84fab4e6d820f9cb2e2e0835544 (patch) | |
| tree | 4fd7c74097fc474150317fb04245460f0992af17 /sound/soc/codecs/cs42l42.h | |
| parent | c073a58a7ec59145f8a0b87403d559645bfd9edb (diff) | |
| parent | 6a7f5bd6185e1c86256d5e52c3bb7a4d390d6e19 (diff) | |
| download | lwn-192664528154a84fab4e6d820f9cb2e2e0835544.tar.gz lwn-192664528154a84fab4e6d820f9cb2e2e0835544.zip | |
Merge remote-tracking branch 'asoc/for-5.14' into asoc-next
Diffstat (limited to 'sound/soc/codecs/cs42l42.h')
| -rw-r--r-- | sound/soc/codecs/cs42l42.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 386c40f9ed31..206b3c81d3e0 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -755,6 +755,7 @@ #define CS42L42_NUM_SUPPLIES 5 #define CS42L42_BOOT_TIME_US 3000 +#define CS42L42_PLL_DIVOUT_TIME_US 800 #define CS42L42_CLOCK_SWITCH_DELAY_US 150 #define CS42L42_PLL_LOCK_POLL_US 250 #define CS42L42_PLL_LOCK_TIMEOUT_US 1250 @@ -773,10 +774,11 @@ struct cs42l42_private { struct regulator_bulk_data supplies[CS42L42_NUM_SUPPLIES]; struct gpio_desc *reset_gpio; struct completion pdn_done; - struct snd_soc_jack jack; + struct snd_soc_jack *jack; int bclk; u32 sclk; u32 srate; + u8 pll_divout; u8 plug_state; u8 hs_type; u8 ts_inv; @@ -787,6 +789,7 @@ struct cs42l42_private { u8 bias_thresholds[CS42L42_NUM_BIASES]; u8 hs_bias_ramp_rate; u8 hs_bias_ramp_time; + u8 hs_bias_sense_en; u8 stream_use; }; |