ASoC: rt712-sdca: change the definition name of SDCA channel number
Subsystems (3)
PATCH 1/2 ASoC: rt712-sdca: change the definition name of SDCA channel number
From: Shuming Fan <[email protected]>
This patch doesn't have any change of functionality.
--- sound/soc/codecs/rt712-sdca-sdw.c | 12 +++++----- sound/soc/codecs/rt712-sdca-sdw.h | 28 +++++++++++------------ sound/soc/codecs/rt712-sdca.c | 38 +++++++++++++++---------------- sound/soc/codecs/rt712-sdca.h | 10 ++++---- 4 files changed, 45 insertions(+), 43 deletions(-)
sound/soc/codecs/rt712-sdca-sdw.c +6 -6
@@ -79,12 +79,12 @@ static bool rt712_sdca_mbq_readable_register(struct device *dev, unsigned int re case 0x5d00000 ... 0x5d00009: case 0x5f00000 ... 0x5f00030: case 0x6100000 ... 0x6100068: -case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ): -case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ): -case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ): -case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ): -case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ): -case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ):return true;default :return false;
sound/soc/codecs/rt712-sdca-sdw.h +14 -14
@@ -57,16 +57,16 @@ static const struct reg_default rt712_sdca_reg_defaults[] = { { 0x3303, 0x1f }, { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_CS01, RT712_SDCA_CTL_SAMPLE_FREQ_INDEX, 0), 0x09 }, { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_CS11, RT712_SDCA_CTL_SAMPLE_FREQ_INDEX, 0), 0x09 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_MUTE, CH_L), 0x01 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_MUTE, CH_R), 0x01 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_MUTE, CH_L), 0x01 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_MUTE, CH_R), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_MUTE, CH_01), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_MUTE, CH_02), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_MUTE, CH_01), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_MUTE, CH_02), 0x01 }, { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PDE40, RT712_SDCA_CTL_REQ_POWER_STATE, 0), 0x03 }, { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PDE12, RT712_SDCA_CTL_REQ_POWER_STATE, 0), 0x03 }, { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_CS31, RT712_SDCA_CTL_SAMPLE_FREQ_INDEX, 0), 0x09 }, { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_PDE23, RT712_SDCA_CTL_REQ_POWER_STATE, 0), 0x03 }, - { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_MUTE, CH_L), 0x01 }, - { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_MUTE, CH_R), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_MUTE, CH_01), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_MUTE, CH_02), 0x01 }, { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_OT23, RT712_SDCA_CTL_VENDOR_DEF, 0), 0x00 }, };
@@ -95,14 +95,14 @@ static const struct reg_default rt712_sdca_mbq_defaults[] = { { 0x6100064, 0x8000 }, { 0x6100065, 0x0000 }, { 0x6100067, 0xff12 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_VOLUME, CH_L), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_VOLUME, CH_R), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_VOLUME, CH_L), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_VOLUME, CH_R), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PLATFORM_FU44, RT712_SDCA_CTL_FU_CH_GAIN, CH_L), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PLATFORM_FU44, RT712_SDCA_CTL_FU_CH_GAIN, CH_R), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_VOLUME, CH_L), 0x0000 }, - { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_VOLUME, CH_R), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_VOLUME, CH_01), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU05, RT712_SDCA_CTL_FU_VOLUME, CH_02), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_VOLUME, CH_01), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_USER_FU0F, RT712_SDCA_CTL_FU_VOLUME, CH_02), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PLATFORM_FU44, RT712_SDCA_CTL_FU_CH_GAIN, CH_01), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_PLATFORM_FU44, RT712_SDCA_CTL_FU_CH_GAIN, CH_02), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_VOLUME, CH_01), 0x0000 }, + { SDW_SDCA_CTL(FUNC_NUM_AMP, RT712_SDCA_ENT_USER_FU06, RT712_SDCA_CTL_FU_VOLUME, CH_02), 0x0000 }, }; #endif /* __RT712_SDW_H__ */
sound/soc/codecs/rt712-sdca.c +19 -19
@@ -592,20 +592,20 @@ static int rt712_sdca_set_gain_get(struct snd_kcontrol *kcontrol,static int rt712_sdca_set_fu0f_capture_ctl (struct rt712_sdca_priv *rt712) {int err; -unsigned int ch_l, ch_r; +unsigned int ch_01, ch_02; - ch_l = (rt712->fu0f_dapm_mute || rt712->fu0f_mixer_l_mute) ?0x01 :0x00 ; - ch_r = (rt712->fu0f_dapm_mute || rt712->fu0f_mixer_r_mute) ?0x01 :0x00 ; + ch_01 = (rt712->fu0f_dapm_mute || rt712->fu0f_mixer_l_mute) ?0x01 :0x00 ; + ch_02 = (rt712->fu0f_dapm_mute || rt712->fu0f_mixer_r_mute) ?0x01 :0x00 ; err =regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F , -RT712_SDCA_CTL_FU_MUTE ,CH_L ), ch_l); +RT712_SDCA_CTL_FU_MUTE ,CH_01 ), ch_01);if (err <0 )return err; err =regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F , -RT712_SDCA_CTL_FU_MUTE ,CH_R ), ch_r); +RT712_SDCA_CTL_FU_MUTE ,CH_02 ), ch_02);if (err <0 )return err;
@@ -649,28 +649,28 @@ static const DECLARE_TLV_DB_SCALE(boost_vol_tlv, 0, 1000, 0);static const struct snd_kcontrol_new rt712_sdca_controls[] = {SOC_DOUBLE_R_EXT_TLV ("FU05 Playback Volume" , -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ), -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ),0 ,0x57 ,0 , rt712_sdca_set_gain_get, rt712_sdca_set_gain_put, out_vol_tlv),SOC_DOUBLE_EXT ("FU0F Capture Switch" ,SND_SOC_NOPM ,0 ,1 ,1 ,0 , rt712_sdca_fu0f_capture_get, rt712_sdca_fu0f_capture_put),SOC_DOUBLE_R_EXT_TLV ("FU0F Capture Volume" , -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ), -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU0F ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ),0 ,0x3f ,0 , rt712_sdca_set_gain_get, rt712_sdca_set_gain_put, mic_vol_tlv),SOC_DOUBLE_R_EXT_TLV ("FU44 Boost Volume" , -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_PLATFORM_FU44 ,RT712_SDCA_CTL_FU_CH_GAIN ,CH_L ), -SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_PLATFORM_FU44 ,RT712_SDCA_CTL_FU_CH_GAIN ,CH_R ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_PLATFORM_FU44 ,RT712_SDCA_CTL_FU_CH_GAIN ,CH_01 ), +SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_PLATFORM_FU44 ,RT712_SDCA_CTL_FU_CH_GAIN ,CH_02 ),8 ,3 ,0 , rt712_sdca_set_gain_get, rt712_sdca_set_gain_put, boost_vol_tlv), };static const struct snd_kcontrol_new rt712_sdca_spk_controls[] = {SOC_DOUBLE_R_EXT_TLV ("FU06 Playback Volume" , -SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_L ), -SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_R ), +SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_01 ), +SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_VOLUME ,CH_02 ),0 ,0x57 ,0 , rt712_sdca_set_gain_get, rt712_sdca_set_gain_put, out_vol_tlv), };
@@ -763,21 +763,21 @@ static int rt712_sdca_fu05_event(struct snd_soc_dapm_widget *w,case SND_SOC_DAPM_POST_PMU :regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 , -RT712_SDCA_CTL_FU_MUTE ,CH_L ), +RT712_SDCA_CTL_FU_MUTE ,CH_01 ), unmute);regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 , -RT712_SDCA_CTL_FU_MUTE ,CH_R ), +RT712_SDCA_CTL_FU_MUTE ,CH_02 ), unmute);break ;case SND_SOC_DAPM_PRE_PMD :regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 , -RT712_SDCA_CTL_FU_MUTE ,CH_L ), +RT712_SDCA_CTL_FU_MUTE ,CH_01 ), mute);regmap_write (rt712->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT712_SDCA_ENT_USER_FU05 , -RT712_SDCA_CTL_FU_MUTE ,CH_R ), +RT712_SDCA_CTL_FU_MUTE ,CH_02 ), mute);break ; }
@@ -885,8 +885,8 @@ static int rt712_sdca_classd_event(struct snd_soc_dapm_widget *w,static const struct snd_kcontrol_new rt712_spk_sto_dac =SOC_DAPM_DOUBLE_R ("Switch" , -SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_MUTE ,CH_L ), -SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_MUTE ,CH_R ), +SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_MUTE ,CH_01 ), +SDW_SDCA_CTL (FUNC_NUM_AMP ,RT712_SDCA_ENT_USER_FU06 ,RT712_SDCA_CTL_FU_MUTE ,CH_02 ),0 ,1 ,1 );static const struct snd_soc_dapm_widget rt712_sdca_dapm_widgets[] = {
sound/soc/codecs/rt712-sdca.h +6 -4
@@ -39,6 +39,12 @@ struct rt712_sdca_priv {bool fu0f_mixer_r_mute; }; +/* SDCA (Channel) */ +#define CH_01 0x01 +#define CH_02 0x02 +#define CH_03 0x03 +#define CH_04 0x04 +/* NID */ #define RT712_VENDOR_REG 0x20#define RT712_VENDOR_CALI 0x58
@@ -176,10 +182,6 @@ struct rt712_sdca_priv {#define RT712_SDCA_CTL_VENDOR_DEF 0x30#define RT712_SDCA_CTL_FU_CH_GAIN 0x0b -/* RT712 SDCA channel */ -#define CH_L 0x01 -#define CH_R 0x02 -/* sample frequency index */ #define RT712_SDCA_RATE_16000HZ 0x04#define RT712_SDCA_RATE_32000HZ 0x07
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 3 lines · On Thu, 20 Jun 2024 18:32:24 +0800, [email protected] wrote:
This patch doesn't have any change of functionality.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: rt712-sdca: change the definition name of SDCA channel number
commit: f2177731b6cdaedfe1dea5ec7d185be579b14cc5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark