On Donnerstag, 19. Mai 2022 17:42:40 CEST Charles Keepax wrote:
> As part of updating the core to directly tell drivers if they are clock
> provider or consumer update these CPU side drivers to use the new direct
> callback.
>
> Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/rockchip/rockchip_i2s.c | 8 ++++----
> sound/soc/rockchip/rockchip_i2s_tdm.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
> index 4ce5d25793875..0a66c7df323dc 100644
> --- a/sound/soc/rockchip/rockchip_i2s.c
> +++ b/sound/soc/rockchip/rockchip_i2s.c
> @@ -199,13 +199,13 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
>
> pm_runtime_get_sync(cpu_dai->dev);
> mask = I2S_CKR_MSS_MASK;
> - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> - case SND_SOC_DAIFMT_CBS_CFS:
> + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
> + case SND_SOC_DAIFMT_BP_FP:
> /* Set source clock in Master mode */
> val = I2S_CKR_MSS_MASTER;
> i2s->is_master_mode = true;
> break;
> - case SND_SOC_DAIFMT_CBM_CFM:
> + case SND_SOC_DAIFMT_BC_FC:
> val = I2S_CKR_MSS_SLAVE;
> i2s->is_master_mode = false;
> break;
> @@ -486,7 +486,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
> .hw_params = rockchip_i2s_hw_params,
> .set_bclk_ratio = rockchip_i2s_set_bclk_ratio,
> .set_sysclk = rockchip_i2s_set_sysclk,
> - .set_fmt = rockchip_i2s_set_fmt,
> + .set_fmt_new = rockchip_i2s_set_fmt,
> .trigger = rockchip_i2s_trigger,
> };
>
> diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
> index 98700e75b82a1..c90afccdae362 100644
> --- a/sound/soc/rockchip/rockchip_i2s_tdm.c
> +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
> @@ -411,12 +411,12 @@ static int rockchip_i2s_tdm_set_fmt(struct snd_soc_dai *cpu_dai,
> }
>
> mask = I2S_CKR_MSS_MASK;
> - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> - case SND_SOC_DAIFMT_CBC_CFC:
> + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
> + case SND_SOC_DAIFMT_BP_FP:
> val = I2S_CKR_MSS_MASTER;
> i2s_tdm->is_master_mode = true;
> break;
> - case SND_SOC_DAIFMT_CBP_CFP:
> + case SND_SOC_DAIFMT_BC_FC:
> val = I2S_CKR_MSS_SLAVE;
> i2s_tdm->is_master_mode = false;
> break;
> @@ -1113,7 +1113,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = {
> .hw_params = rockchip_i2s_tdm_hw_params,
> .set_bclk_ratio = rockchip_i2s_tdm_set_bclk_ratio,
> .set_sysclk = rockchip_i2s_tdm_set_sysclk,
> - .set_fmt = rockchip_i2s_tdm_set_fmt,
> + .set_fmt_new = rockchip_i2s_tdm_set_fmt,
> .set_tdm_slot = rockchip_dai_tdm_slot,
> .trigger = rockchip_i2s_tdm_trigger,
> };
>
Please run ./scripts/get_maintainer.pl against the individual patches so
that I'm included in the recipients of the e-mail as well.
Anyway, for the i2s-tdm parts:
Tested-by: Nicolas Frattaroli <frattaroli.nicolas@xxxxxxxxx>
Tested on a RK3566 connected to an RK817 codec.
Regards,
Nicolas Frattaroli
