ASoC: mediatek: cleanup audio driver for MT2701 (600b2fd4) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c

+3 −11

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*/		*/

	#include <sound/soc.h>
	#include <linux/regmap.h>
	#include <linux/pm_runtime.h>

	#include "mt2701-afe-common.h"		#include "mt2701-afe-common.h"
	#include "mt2701-afe-clock-ctrl.h"		#include "mt2701-afe-clock-ctrl.h"

	@@ -223,8 +219,8 @@ int mt2701_afe_enable_clock(struct mtk_base_afe *afe)
	}		}

	regmap_update_bits(afe->regmap, ASYS_TOP_CON,		regmap_update_bits(afe->regmap, ASYS_TOP_CON,
	AUDIO_TOP_CON0_A1SYS_A2SYS_ON,		ASYS_TOP_CON_ASYS_TIMING_ON,
	AUDIO_TOP_CON0_A1SYS_A2SYS_ON);		ASYS_TOP_CON_ASYS_TIMING_ON);
	regmap_update_bits(afe->regmap, AFE_DAC_CON0,		regmap_update_bits(afe->regmap, AFE_DAC_CON0,
	AFE_DAC_CON0_AFE_ON,		AFE_DAC_CON0_AFE_ON,
	AFE_DAC_CON0_AFE_ON);		AFE_DAC_CON0_AFE_ON);
	@@ -239,7 +235,7 @@ int mt2701_afe_enable_clock(struct mtk_base_afe *afe)
	int mt2701_afe_disable_clock(struct mtk_base_afe *afe)		int mt2701_afe_disable_clock(struct mtk_base_afe *afe)
	{		{
	regmap_update_bits(afe->regmap, ASYS_TOP_CON,		regmap_update_bits(afe->regmap, ASYS_TOP_CON,
	AUDIO_TOP_CON0_A1SYS_A2SYS_ON, 0);		ASYS_TOP_CON_ASYS_TIMING_ON, 0);
	regmap_update_bits(afe->regmap, AFE_DAC_CON0,		regmap_update_bits(afe->regmap, AFE_DAC_CON0,
	AFE_DAC_CON0_AFE_ON, 0);		AFE_DAC_CON0_AFE_ON, 0);

	@@ -272,7 +268,3 @@ void mt2701_mclk_configuration(struct mtk_base_afe *afe, int id, int domain,
	if (ret)		if (ret)
	dev_err(afe->dev, "failed to set mclk divider %d\n", ret);		dev_err(afe->dev, "failed to set mclk divider %d\n", ret);
	}		}

	MODULE_DESCRIPTION("MT2701 afe clock control");
	MODULE_AUTHOR("Garlic Tseng <garlic.tseng@mediatek.com>");
	MODULE_LICENSE("GPL v2");

sound/soc/mediatek/mt2701/mt2701-afe-common.h

+4 −16

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	#ifndef _MT_2701_AFE_COMMON_H_		#ifndef _MT_2701_AFE_COMMON_H_
	#define _MT_2701_AFE_COMMON_H_		#define _MT_2701_AFE_COMMON_H_

	#include <sound/soc.h>		#include <sound/soc.h>
	#include <linux/clk.h>		#include <linux/clk.h>
	#include <linux/regmap.h>		#include <linux/regmap.h>
	@@ -25,16 +26,7 @@
	#define MT2701_STREAM_DIR_NUM (SNDRV_PCM_STREAM_LAST + 1)		#define MT2701_STREAM_DIR_NUM (SNDRV_PCM_STREAM_LAST + 1)
	#define MT2701_PLL_DOMAIN_0_RATE 98304000		#define MT2701_PLL_DOMAIN_0_RATE 98304000
	#define MT2701_PLL_DOMAIN_1_RATE 90316800		#define MT2701_PLL_DOMAIN_1_RATE 90316800
	#define MT2701_AUD_AUD_MUX1_DIV_RATE (MT2701_PLL_DOMAIN_0_RATE / 2)		#define MT2701_I2S_NUM 4
	#define MT2701_AUD_AUD_MUX2_DIV_RATE (MT2701_PLL_DOMAIN_1_RATE / 2)

	enum {
	MT2701_I2S_1,
	MT2701_I2S_2,
	MT2701_I2S_3,
	MT2701_I2S_4,
	MT2701_I2S_NUM,
	};

	enum {		enum {
	MT2701_MEMIF_DL1,		MT2701_MEMIF_DL1,
	@@ -62,8 +54,7 @@ enum {
	};		};

	enum {		enum {
	MT2701_IRQ_ASYS_START,		MT2701_IRQ_ASYS_IRQ1,
	MT2701_IRQ_ASYS_IRQ1 = MT2701_IRQ_ASYS_START,
	MT2701_IRQ_ASYS_IRQ2,		MT2701_IRQ_ASYS_IRQ2,
	MT2701_IRQ_ASYS_IRQ3,		MT2701_IRQ_ASYS_IRQ3,
	MT2701_IRQ_ASYS_END,		MT2701_IRQ_ASYS_END,
	@@ -100,9 +91,6 @@ static const unsigned int mt2701_afe_backup_list[] = {
	AFE_MEMIF_PBUF_SIZE,		AFE_MEMIF_PBUF_SIZE,
	};		};

	struct snd_pcm_substream;
	struct mtk_base_irq_data;

	struct mt2701_i2s_data {		struct mt2701_i2s_data {
	int i2s_ctrl_reg;		int i2s_ctrl_reg;
	int i2s_asrc_fs_shift;		int i2s_asrc_fs_shift;
	@@ -120,7 +108,7 @@ struct mt2701_i2s_path {
	int mclk_rate;		int mclk_rate;
	int on[I2S_DIR_NUM];		int on[I2S_DIR_NUM];
	int occupied[I2S_DIR_NUM];		int occupied[I2S_DIR_NUM];
	const struct mt2701_i2s_data *i2s_data[2];		const struct mt2701_i2s_data *i2s_data[I2S_DIR_NUM];
	struct clk *hop_ck[I2S_DIR_NUM];		struct clk *hop_ck[I2S_DIR_NUM];
	struct clk *sel_ck;		struct clk *sel_ck;
	struct clk *div_ck;		struct clk *div_ck;

sound/soc/mediatek/mt2701/mt2701-afe-pcm.c

+15 −79

Original line number	Original line	Diff line number	Diff line
	@@ -20,16 +20,12 @@
	#include <linux/of.h>		#include <linux/of.h>
	#include <linux/of_address.h>		#include <linux/of_address.h>
	#include <linux/pm_runtime.h>		#include <linux/pm_runtime.h>
	#include <sound/soc.h>

	#include "mt2701-afe-common.h"		#include "mt2701-afe-common.h"

	#include "mt2701-afe-clock-ctrl.h"		#include "mt2701-afe-clock-ctrl.h"
	#include "../common/mtk-afe-platform-driver.h"		#include "../common/mtk-afe-platform-driver.h"
	#include "../common/mtk-afe-fe-dai.h"		#include "../common/mtk-afe-fe-dai.h"

	#define AFE_IRQ_STATUS_BITS 0xff

	static const struct snd_pcm_hardware mt2701_afe_hardware = {		static const struct snd_pcm_hardware mt2701_afe_hardware = {
	.info = SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_INTERLEAVED		.info = SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_INTERLEAVED
	\| SNDRV_PCM_INFO_RESUME \| SNDRV_PCM_INFO_MMAP_VALID,		\| SNDRV_PCM_INFO_RESUME \| SNDRV_PCM_INFO_MMAP_VALID,
	@@ -107,21 +103,16 @@ static int mt2701_afe_i2s_startup(struct snd_pcm_substream *substream,

	static int mt2701_afe_i2s_path_shutdown(struct snd_pcm_substream *substream,		static int mt2701_afe_i2s_path_shutdown(struct snd_pcm_substream *substream,
	struct snd_soc_dai *dai,		struct snd_soc_dai *dai,
			int i2s_num,
	int dir_invert)		int dir_invert)
	{		{
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct mtk_base_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);		struct mtk_base_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
	struct mt2701_afe_private *afe_priv = afe->platform_priv;		struct mt2701_afe_private *afe_priv = afe->platform_priv;
	int i2s_num = mt2701_dai_num_to_i2s(afe, dai->id);		struct mt2701_i2s_path *i2s_path = &afe_priv->i2s_path[i2s_num];
	struct mt2701_i2s_path *i2s_path;
	const struct mt2701_i2s_data *i2s_data;		const struct mt2701_i2s_data *i2s_data;
	int stream_dir = substream->stream;		int stream_dir = substream->stream;

	if (i2s_num < 0)
	return i2s_num;

	i2s_path = &afe_priv->i2s_path[i2s_num];

	if (dir_invert) {		if (dir_invert) {
	if (stream_dir == SNDRV_PCM_STREAM_PLAYBACK)		if (stream_dir == SNDRV_PCM_STREAM_PLAYBACK)
	stream_dir = SNDRV_PCM_STREAM_CAPTURE;		stream_dir = SNDRV_PCM_STREAM_CAPTURE;
	@@ -167,11 +158,11 @@ static void mt2701_afe_i2s_shutdown(struct snd_pcm_substream *substream,
	else		else
	goto I2S_UNSTART;		goto I2S_UNSTART;

	mt2701_afe_i2s_path_shutdown(substream, dai, 0);		mt2701_afe_i2s_path_shutdown(substream, dai, i2s_num, 0);

	/* need to disable i2s-out path when disable i2s-in */		/* need to disable i2s-out path when disable i2s-in */
	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
	mt2701_afe_i2s_path_shutdown(substream, dai, 1);		mt2701_afe_i2s_path_shutdown(substream, dai, i2s_num, 1);

	I2S_UNSTART:		I2S_UNSTART:
	/* disable mclk */		/* disable mclk */
	@@ -180,24 +171,19 @@ static void mt2701_afe_i2s_shutdown(struct snd_pcm_substream *substream,

	static int mt2701_i2s_path_prepare_enable(struct snd_pcm_substream *substream,		static int mt2701_i2s_path_prepare_enable(struct snd_pcm_substream *substream,
	struct snd_soc_dai *dai,		struct snd_soc_dai *dai,
			int i2s_num,
	int dir_invert)		int dir_invert)
	{		{
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct mtk_base_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);		struct mtk_base_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
	struct mt2701_afe_private *afe_priv = afe->platform_priv;		struct mt2701_afe_private *afe_priv = afe->platform_priv;
	int i2s_num = mt2701_dai_num_to_i2s(afe, dai->id);		struct mt2701_i2s_path *i2s_path = &afe_priv->i2s_path[i2s_num];
	struct mt2701_i2s_path *i2s_path;
	const struct mt2701_i2s_data *i2s_data;		const struct mt2701_i2s_data *i2s_data;
	struct snd_pcm_runtime * const runtime = substream->runtime;		struct snd_pcm_runtime * const runtime = substream->runtime;
	int reg, fs, w_len = 1; /* now we support bck 64bits only */		int reg, fs, w_len = 1; /* now we support bck 64bits only */
	int stream_dir = substream->stream;		int stream_dir = substream->stream;
	unsigned int mask = 0, val = 0;		unsigned int mask = 0, val = 0;

	if (i2s_num < 0)
	return i2s_num;

	i2s_path = &afe_priv->i2s_path[i2s_num];

	if (dir_invert) {		if (dir_invert) {
	if (stream_dir == SNDRV_PCM_STREAM_PLAYBACK)		if (stream_dir == SNDRV_PCM_STREAM_PLAYBACK)
	stream_dir = SNDRV_PCM_STREAM_CAPTURE;		stream_dir = SNDRV_PCM_STREAM_CAPTURE;
	@@ -288,13 +274,13 @@ static int mt2701_afe_i2s_prepare(struct snd_pcm_substream *substream,
	mt2701_mclk_configuration(afe, i2s_num, clk_domain, mclk_rate);		mt2701_mclk_configuration(afe, i2s_num, clk_domain, mclk_rate);

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
	mt2701_i2s_path_prepare_enable(substream, dai, 0);		mt2701_i2s_path_prepare_enable(substream, dai, i2s_num, 0);
	} else {		} else {
	/* need to enable i2s-out path when enable i2s-in */		/* need to enable i2s-out path when enable i2s-in */
	/* prepare for another direction "out" */		/* prepare for another direction "out" */
	mt2701_i2s_path_prepare_enable(substream, dai, 1);		mt2701_i2s_path_prepare_enable(substream, dai, i2s_num, 1);
	/* prepare for "in" */		/* prepare for "in" */
	mt2701_i2s_path_prepare_enable(substream, dai, 0);		mt2701_i2s_path_prepare_enable(substream, dai, i2s_num, 0);
	}		}

	return 0;		return 0;
	@@ -562,7 +548,6 @@ static const struct snd_soc_dai_ops mt2701_single_memif_dai_ops = {
	.hw_free = mtk_afe_fe_hw_free,		.hw_free = mtk_afe_fe_hw_free,
	.prepare = mtk_afe_fe_prepare,		.prepare = mtk_afe_fe_prepare,
	.trigger = mtk_afe_fe_trigger,		.trigger = mtk_afe_fe_trigger,

	};		};

	static const struct snd_soc_dai_ops mt2701_dlm_memif_dai_ops = {		static const struct snd_soc_dai_ops mt2701_dlm_memif_dai_ops = {
	@@ -903,31 +888,6 @@ static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_i2s4[] = {
	PWR2_TOP_CON, 19, 1, 0),		PWR2_TOP_CON, 19, 1, 0),
	};		};

	static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_asrc0[] = {
	SOC_DAPM_SINGLE_AUTODISABLE("Asrc0 out Switch", AUDIO_TOP_CON4, 14, 1,
	1),
	};

	static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_asrc1[] = {
	SOC_DAPM_SINGLE_AUTODISABLE("Asrc1 out Switch", AUDIO_TOP_CON4, 15, 1,
	1),
	};

	static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_asrc2[] = {
	SOC_DAPM_SINGLE_AUTODISABLE("Asrc2 out Switch", PWR2_TOP_CON, 6, 1,
	1),
	};

	static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_asrc3[] = {
	SOC_DAPM_SINGLE_AUTODISABLE("Asrc3 out Switch", PWR2_TOP_CON, 7, 1,
	1),
	};

	static const struct snd_kcontrol_new mt2701_afe_multi_ch_out_asrc4[] = {
	SOC_DAPM_SINGLE_AUTODISABLE("Asrc4 out Switch", PWR2_TOP_CON, 8, 1,
	1),
	};

	static const struct snd_soc_dapm_widget mt2701_afe_pcm_widgets[] = {		static const struct snd_soc_dapm_widget mt2701_afe_pcm_widgets[] = {
	/* inter-connections */		/* inter-connections */
	SND_SOC_DAPM_MIXER("I00", SND_SOC_NOPM, 0, 0, NULL, 0),		SND_SOC_DAPM_MIXER("I00", SND_SOC_NOPM, 0, 0, NULL, 0),
	@@ -987,19 +947,6 @@ static const struct snd_soc_dapm_widget mt2701_afe_pcm_widgets[] = {
	SND_SOC_DAPM_MIXER("I18I19", SND_SOC_NOPM, 0, 0,		SND_SOC_DAPM_MIXER("I18I19", SND_SOC_NOPM, 0, 0,
	mt2701_afe_multi_ch_out_i2s3,		mt2701_afe_multi_ch_out_i2s3,
	ARRAY_SIZE(mt2701_afe_multi_ch_out_i2s3)),		ARRAY_SIZE(mt2701_afe_multi_ch_out_i2s3)),

	SND_SOC_DAPM_MIXER("ASRC_O0", SND_SOC_NOPM, 0, 0,
	mt2701_afe_multi_ch_out_asrc0,
	ARRAY_SIZE(mt2701_afe_multi_ch_out_asrc0)),
	SND_SOC_DAPM_MIXER("ASRC_O1", SND_SOC_NOPM, 0, 0,
	mt2701_afe_multi_ch_out_asrc1,
	ARRAY_SIZE(mt2701_afe_multi_ch_out_asrc1)),
	SND_SOC_DAPM_MIXER("ASRC_O2", SND_SOC_NOPM, 0, 0,
	mt2701_afe_multi_ch_out_asrc2,
	ARRAY_SIZE(mt2701_afe_multi_ch_out_asrc2)),
	SND_SOC_DAPM_MIXER("ASRC_O3", SND_SOC_NOPM, 0, 0,
	mt2701_afe_multi_ch_out_asrc3,
	ARRAY_SIZE(mt2701_afe_multi_ch_out_asrc3)),
	};		};

	static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {		static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {
	@@ -1009,7 +956,6 @@ static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {

	{"I2S0 Playback", NULL, "O15"},		{"I2S0 Playback", NULL, "O15"},
	{"I2S0 Playback", NULL, "O16"},		{"I2S0 Playback", NULL, "O16"},

	{"I2S1 Playback", NULL, "O17"},		{"I2S1 Playback", NULL, "O17"},
	{"I2S1 Playback", NULL, "O18"},		{"I2S1 Playback", NULL, "O18"},
	{"I2S2 Playback", NULL, "O19"},		{"I2S2 Playback", NULL, "O19"},
	@@ -1026,7 +972,6 @@ static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {

	{"I00", NULL, "I2S0 Capture"},		{"I00", NULL, "I2S0 Capture"},
	{"I01", NULL, "I2S0 Capture"},		{"I01", NULL, "I2S0 Capture"},

	{"I02", NULL, "I2S1 Capture"},		{"I02", NULL, "I2S1 Capture"},
	{"I03", NULL, "I2S1 Capture"},		{"I03", NULL, "I2S1 Capture"},
	/* I02,03 link to UL2, also need to open I2S0 */		/* I02,03 link to UL2, also need to open I2S0 */
	@@ -1034,15 +979,10 @@ static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {

	{"I26", NULL, "BT Capture"},		{"I26", NULL, "BT Capture"},

	{"ASRC_O0", "Asrc0 out Switch", "DLM"},		{"I12I13", "Multich I2S0 Out Switch", "DLM"},
	{"ASRC_O1", "Asrc1 out Switch", "DLM"},		{"I14I15", "Multich I2S1 Out Switch", "DLM"},
	{"ASRC_O2", "Asrc2 out Switch", "DLM"},		{"I16I17", "Multich I2S2 Out Switch", "DLM"},
	{"ASRC_O3", "Asrc3 out Switch", "DLM"},		{"I18I19", "Multich I2S3 Out Switch", "DLM"},

	{"I12I13", "Multich I2S0 Out Switch", "ASRC_O0"},
	{"I14I15", "Multich I2S1 Out Switch", "ASRC_O1"},
	{"I16I17", "Multich I2S2 Out Switch", "ASRC_O2"},
	{"I18I19", "Multich I2S3 Out Switch", "ASRC_O3"},

	{ "I12", NULL, "I12I13" },		{ "I12", NULL, "I12I13" },
	{ "I13", NULL, "I12I13" },		{ "I13", NULL, "I12I13" },
	@@ -1067,7 +1007,6 @@ static const struct snd_soc_dapm_route mt2701_afe_pcm_routes[] = {
	{ "O21", "I18 Switch", "I18" },		{ "O21", "I18 Switch", "I18" },
	{ "O22", "I19 Switch", "I19" },		{ "O22", "I19 Switch", "I19" },
	{ "O31", "I35 Switch", "I35" },		{ "O31", "I35 Switch", "I35" },

	};		};

	static const struct snd_soc_component_driver mt2701_afe_pcm_dai_component = {		static const struct snd_soc_component_driver mt2701_afe_pcm_dai_component = {
	@@ -1484,12 +1423,13 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);		afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
	if (!afe)		if (!afe)
	return -ENOMEM;		return -ENOMEM;

	afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv),		afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv),
	GFP_KERNEL);		GFP_KERNEL);
	if (!afe->platform_priv)		if (!afe->platform_priv)
	return -ENOMEM;		return -ENOMEM;
	afe_priv = afe->platform_priv;

			afe_priv = afe->platform_priv;
	afe->dev = &pdev->dev;		afe->dev = &pdev->dev;
	dev = afe->dev;		dev = afe->dev;

	@@ -1524,7 +1464,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	afe->memif_size = MT2701_MEMIF_NUM;		afe->memif_size = MT2701_MEMIF_NUM;
	afe->memif = devm_kcalloc(dev, afe->memif_size, sizeof(*afe->memif),		afe->memif = devm_kcalloc(dev, afe->memif_size, sizeof(*afe->memif),
	GFP_KERNEL);		GFP_KERNEL);

	if (!afe->memif)		if (!afe->memif)
	return -ENOMEM;		return -ENOMEM;

	@@ -1537,7 +1476,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	afe->irqs_size = MT2701_IRQ_ASYS_END;		afe->irqs_size = MT2701_IRQ_ASYS_END;
	afe->irqs = devm_kcalloc(dev, afe->irqs_size, sizeof(*afe->irqs),		afe->irqs = devm_kcalloc(dev, afe->irqs_size, sizeof(*afe->irqs),
	GFP_KERNEL);		GFP_KERNEL);

	if (!afe->irqs)		if (!afe->irqs)
	return -ENOMEM;		return -ENOMEM;

	@@ -1555,7 +1493,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	afe->mtk_afe_hardware = &mt2701_afe_hardware;		afe->mtk_afe_hardware = &mt2701_afe_hardware;
	afe->memif_fs = mt2701_memif_fs;		afe->memif_fs = mt2701_memif_fs;
	afe->irq_fs = mt2701_irq_fs;		afe->irq_fs = mt2701_irq_fs;

	afe->reg_back_up_list = mt2701_afe_backup_list;		afe->reg_back_up_list = mt2701_afe_backup_list;
	afe->reg_back_up_list_num = ARRAY_SIZE(mt2701_afe_backup_list);		afe->reg_back_up_list_num = ARRAY_SIZE(mt2701_afe_backup_list);
	afe->runtime_resume = mt2701_afe_runtime_resume;		afe->runtime_resume = mt2701_afe_runtime_resume;
	@@ -1646,4 +1583,3 @@ module_platform_driver(mt2701_afe_pcm_driver);
	MODULE_DESCRIPTION("Mediatek ALSA SoC AFE platform driver for 2701");		MODULE_DESCRIPTION("Mediatek ALSA SoC AFE platform driver for 2701");
	MODULE_AUTHOR("Garlic Tseng <garlic.tseng@mediatek.com>");		MODULE_AUTHOR("Garlic Tseng <garlic.tseng@mediatek.com>");
	MODULE_LICENSE("GPL v2");		MODULE_LICENSE("GPL v2");

sound/soc/mediatek/mt2701/mt2701-reg.h

+2 −39

Original line number	Original line	Diff line number	Diff line
	@@ -17,17 +17,6 @@
	#ifndef _MT2701_REG_H_		#ifndef _MT2701_REG_H_
	#define _MT2701_REG_H_		#define _MT2701_REG_H_

	#include <linux/delay.h>
	#include <linux/module.h>
	#include <linux/of.h>
	#include <linux/of_address.h>
	#include <linux/pm_runtime.h>
	#include <sound/soc.h>
	#include "mt2701-afe-common.h"

	/*****************************************************************************
	* R E G I S T E R D E F I N I T I O N
	*****************************************************************************/
	#define AUDIO_TOP_CON0 0x0000		#define AUDIO_TOP_CON0 0x0000
	#define AUDIO_TOP_CON4 0x0010		#define AUDIO_TOP_CON4 0x0010
	#define AUDIO_TOP_CON5 0x0014		#define AUDIO_TOP_CON5 0x0014
	@@ -109,18 +98,6 @@
	#define AFE_DAI_BASE 0x1370		#define AFE_DAI_BASE 0x1370
	#define AFE_DAI_CUR 0x137c		#define AFE_DAI_CUR 0x137c

	/* AUDIO_TOP_CON0 (0x0000) */
	#define AUDIO_TOP_CON0_A1SYS_A2SYS_ON (0x3 << 0)
	#define AUDIO_TOP_CON0_PDN_AFE (0x1 << 2)
	#define AUDIO_TOP_CON0_PDN_APLL_CK (0x1 << 23)

	/* AUDIO_TOP_CON4 (0x0010) */
	#define AUDIO_TOP_CON4_I2SO1_PWN (0x1 << 6)
	#define AUDIO_TOP_CON4_PDN_A1SYS (0x1 << 21)
	#define AUDIO_TOP_CON4_PDN_A2SYS (0x1 << 22)
	#define AUDIO_TOP_CON4_PDN_AFE_CONN (0x1 << 23)
	#define AUDIO_TOP_CON4_PDN_MRGIF (0x1 << 25)

	/* AFE_DAIBT_CON0 (0x001c) */		/* AFE_DAIBT_CON0 (0x001c) */
	#define AFE_DAIBT_CON0_DAIBT_EN (0x1 << 0)		#define AFE_DAIBT_CON0_DAIBT_EN (0x1 << 0)
	#define AFE_DAIBT_CON0_BT_FUNC_EN (0x1 << 1)		#define AFE_DAIBT_CON0_BT_FUNC_EN (0x1 << 1)
	@@ -137,22 +114,8 @@
	#define AFE_MRGIF_CON_I2S_MODE_MASK (0xf << 20)		#define AFE_MRGIF_CON_I2S_MODE_MASK (0xf << 20)
	#define AFE_MRGIF_CON_I2S_MODE_32K (0x4 << 20)		#define AFE_MRGIF_CON_I2S_MODE_32K (0x4 << 20)

	/* ASYS_I2SO1_CON (0x061c) */		/* ASYS_TOP_CON (0x0600) */
	#define ASYS_I2SO1_CON_FS (0x1f << 8)		#define ASYS_TOP_CON_ASYS_TIMING_ON (0x3 << 0)
	#define ASYS_I2SO1_CON_FS_SET(x) ((x) << 8)
	#define ASYS_I2SO1_CON_MULTI_CH (0x1 << 16)
	#define ASYS_I2SO1_CON_SIDEGEN (0x1 << 30)
	#define ASYS_I2SO1_CON_I2S_EN (0x1 << 0)
	/* 0:EIAJ 1:I2S */
	#define ASYS_I2SO1_CON_I2S_MODE (0x1 << 3)
	#define ASYS_I2SO1_CON_WIDE_MODE (0x1 << 1)
	#define ASYS_I2SO1_CON_WIDE_MODE_SET(x) ((x) << 1)

	/* PWR2_TOP_CON (0x0634) */
	#define PWR2_TOP_CON_INIT_VAL (0xffe1ffff)

	/* ASYS_IRQ_CLR (0x07c0) */
	#define ASYS_IRQ_CLR_ALL (0xffffffff)

	/* PWR2_ASM_CON1 (0x1070) */		/* PWR2_ASM_CON1 (0x1070) */
	#define PWR2_ASM_CON1_INIT_VAL (0x492492)		#define PWR2_ASM_CON1_INIT_VAL (0x492492)