audio: fix samesource clk after play DDP [1/1]

PD#SWPL-4331

Problem:
Same source clk doesn't recover to 48K
after playback 192k DDP stream.

Solution:
Add ways to recover the clk.

Verify:
Local verified

Change-Id: If410d9ca04446c35bafebe2913b01e19b5fee224
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

MAINTAINERS

@@ -13794,6 +13794,7 @@ F: arch/arm/boot/dts/amlogic>
 
 ANLOGIC AUDIO
 M: Xing Wang <xing.wang@amlogic.com>
+M: Shuai Li <shuai.li@amlogic.com>
 F: arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
 F: arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
 F: arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts

sound/soc/amlogic/auge/spdif.c

@@ -39,12 +39,10 @@
 #include "audio_utils.h"
 #include "resample.h"
 #include "resample_hw.h"
+#include "spdif.h"
 
 #define DRV_NAME "aml_spdif"
 
-#define SPDIF_A	0
-#define SPDIF_B	1
-
 /* Debug by PTM when bringup */
 /*#define __PTM_SPDIF_CLK__*/
 
@@ -54,7 +52,7 @@
 /*#define __SPDIFIN_AUDIO_TYPE_HW__*/
 
 struct spdif_chipinfo {
-	unsigned int id;
+	enum SPDIF_ID id;
 
 	/* add ch_cnt to ch_num */
 	bool chnum_en;
@@ -93,7 +91,7 @@ struct aml_spdif {
 	/* external connect */
 	struct extcon_dev *edev;
 
-	unsigned int id;
+	enum SPDIF_ID id;
 	struct spdif_chipinfo *chipinfo;
 	unsigned int clk_cont; /* CONTINUOUS CLOCK */
 
@@ -125,6 +123,7 @@ struct aml_spdif {
 	/* last value for pc, pd */
 	int pc_last;
 	int pd_last;
+	bool on;
 };
 
 static const struct snd_pcm_hardware aml_spdif_hardware = {
@@ -167,6 +166,20 @@ static const char *const spdifin_samplerate[] = {
 	"192000"
 };
 
+struct aml_spdif *spdif_priv[SPDIF_ID_CNT];
+int spdif_set_audio_clk(enum SPDIF_ID id,
+		struct clk *clk_src, int rate, bool same)
+{
+	if (spdif_priv[id]->on && same) {
+		pr_debug("spdif priority");
+		return 0;
+	}
+
+	clk_set_parent(spdif_priv[id]->clk_spdifout, clk_src);
+	clk_set_rate(spdif_priv[id]->clk_spdifout, rate);
+	return 0;
+}
+
 static int spdifin_samplerate_get_enum(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
@@ -667,6 +680,7 @@ static int aml_spdif_open(struct snd_pcm_substream *substream)
 	snd_soc_set_runtime_hwparams(substream, &aml_spdif_hardware);
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		p_spdif->on = 1;
 		p_spdif->fddr = aml_audio_register_frddr(dev,
 			p_spdif->actrl,
 			aml_spdif_ddr_isr, substream);
@@ -712,6 +726,7 @@ static int aml_spdif_close(struct snd_pcm_substream *substream)
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		aml_audio_unregister_frddr(p_spdif->dev, substream);
+		p_spdif->on = 0;
 	} else {
 		aml_audio_unregister_toddr(p_spdif->dev, substream);
 		free_irq(p_spdif->irq_spdifin, p_spdif);
@@ -725,7 +740,7 @@ static int aml_spdif_close(struct snd_pcm_substream *substream)
 		}
 
 		/* clear extcon status */
-		if (p_spdif->id == 0) {
+		if (p_spdif->id == SPDIF_A) {
 			extcon_set_state(p_spdif->edev,
 				EXTCON_SPDIFIN_SAMPLERATE, 0);
 
@@ -871,7 +886,7 @@ static int aml_spdif_new(struct snd_soc_pcm_runtime *rtd)
 
 	pr_debug("%s spdif_%s, clk continuous:%d\n",
 		__func__,
-		(p_spdif->id == 0) ? "a":"b",
+		(p_spdif->id == SPDIF_A) ? "a":"b",
 		p_spdif->clk_cont);
 
 	/* keep frddr when probe, after spdif_frddr_init done
@@ -927,7 +942,7 @@ static int aml_dai_spdif_startup(
 
 		if (p_spdif->clk_cont) {
 			pr_info("spdif_%s keep clk continuous\n",
-				(p_spdif->id == 0) ? "a":"b");
+				(p_spdif->id == SPDIF_A) ? "a":"b");
 			return 0;
 		}
 		/* enable clock gate */
@@ -1000,7 +1015,7 @@ static void aml_dai_spdif_shutdown(
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		if (p_spdif->clk_cont) {
 			pr_info("spdif_%s keep clk continuous\n",
-				(p_spdif->id == 0) ? "a":"b");
+				(p_spdif->id == SPDIF_A) ? "a":"b");
 			return;
 		}
 
@@ -1037,10 +1052,10 @@ static int aml_dai_spdif_prepare(
 		struct iec958_chsts chsts;
 
 		switch (p_spdif->id) {
-		case 0:
+		case SPDIF_A:
 			dst = SPDIFOUT_A;
 			break;
-		case 1:
+		case SPDIF_B:
 			dst = SPDIFOUT_B;
 			break;
 		default:
@@ -1248,8 +1263,10 @@ static void aml_set_spdifclk(struct aml_spdif *p_spdif)
 		mpll_freq = p_spdif->sysclk_freq * 58 / 2; /* 96k */
 #endif
 		clk_set_rate(p_spdif->sysclk, mpll_freq);
-		clk_set_rate(p_spdif->clk_spdifout,
-			p_spdif->sysclk_freq);
+		//clk_set_rate(p_spdif->clk_spdifout,
+		//	p_spdif->sysclk_freq);
+		spdif_set_audio_clk(p_spdif->id,
+				p_spdif->sysclk, p_spdif->sysclk_freq, 0);
 
 		ret = clk_prepare_enable(p_spdif->sysclk);
 		if (ret) {
@@ -1344,7 +1361,7 @@ static int aml_spdif_parse_of(struct platform_device *pdev)
 	int ret = 0;
 
 	/* clock for spdif in */
-	if (p_spdif->id == 0) {
+	if (p_spdif->id == SPDIF_A) {
 		/* clock gate */
 		p_spdif->gate_spdifin = devm_clk_get(dev, "gate_spdifin");
 		if (IS_ERR(p_spdif->gate_spdifin)) {
@@ -1537,6 +1554,7 @@ static int aml_spdif_platform_probe(struct platform_device *pdev)
 		dev_warn_once(dev,
 			"check whether to update spdif chipinfo\n");
 
+	spdif_priv[aml_spdif->id] = aml_spdif;
 	pr_debug("%s, spdif ID = %u\n", __func__, aml_spdif->id);
 
 	/* get audio controller */

sound/soc/amlogic/auge/spdif.h

@@ -0,0 +1,31 @@
+/*
+ * sound/soc/amlogic/auge/spdif.h
+ *
+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ */
+
+#ifndef __AML_SPDIF_H__
+#define __AML_SPDIF_H__
+#include <linux/clk.h>
+
+enum SPDIF_ID {
+	SPDIF_A,
+	SPDIF_B,
+	SPDIF_ID_CNT
+};
+
+int spdif_set_audio_clk(enum SPDIF_ID id,
+		struct clk *clk_src, int rate, bool same);
+
+#endif

sound/soc/amlogic/auge/spdif_hw.c

@@ -486,7 +486,7 @@ void spdifout_samesource_set(int spdif_index, int fifo_id,
 
 	/* clk for spdif_b is always on */
 	/*if (!spdif_id)*/
-		spdifout_clk_ctrl(spdif_id, /*is_enable*/true);
+		//spdifout_clk_ctrl(spdif_id, /*is_enable*/true);
 
 	if (is_enable)
 		spdifout_fifo_ctrl(spdif_id, fifo_id, bitwidth, channels);

sound/soc/amlogic/auge/tdm.c

@@ -40,6 +40,7 @@
 #include "tdm_hw.h"
 #include "sharebuffer.h"
 #include "vad.h"
+#include "spdif.h"
 
 /*#define __PTM_TDM_CLK__*/
 
@@ -393,6 +394,9 @@ static int aml_dai_tdm_prepare(struct snd_pcm_substream *substream,
 					p_tdm->samesource_sel))) {
 				sharebuffer_prepare(substream,
 					fr, p_tdm->samesource_sel);
+				/* sharebuffer default uses spdif_a */
+				spdif_set_audio_clk(SPDIF_A, p_tdm->clk,
+					runtime->rate*128, 1);
 		}
 
 		/* i2s source to hdmix */