Commit 0db99577 authored by Stefan Binding's avatar Stefan Binding Committed by Takashi Iwai
Browse files

ASoC: cs35l41: Move cs_dsp config struct into shared code 



This can then be used by HDA code to configure cs_dsp.

Signed-off-by: default avatarStefan Binding <sbinding@opensource.cirrus.com>
Signed-off-by: default avatarVitaly Rodionov <vitalyr@opensource.cirrus.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220509214703.4482-9-vitalyr@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ff8aad07

include/sound/cs35l41.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define __CS35L41_H



#include <linux/regmap.h>

#include <linux/firmware/cirrus/cs_dsp.h>



#define CS35L41_FIRSTREG		0x00000000

#define CS35L41_LASTREG			0x03804FE8
@@ -877,6 +878,7 @@ int cs35l41_set_channels(struct device *dev, struct regmap *reg, 
			 unsigned int tx_num, unsigned int *tx_slot,

			 unsigned int rx_num, unsigned int *rx_slot);

int cs35l41_gpio_config(struct regmap *regmap, struct cs35l41_hw_cfg *hw_cfg);

void cs35l41_configure_cs_dsp(struct device *dev, struct regmap *reg, struct cs_dsp *dsp);

int cs35l41_set_cspl_mbox_cmd(struct device *dev, struct regmap *regmap,

			      enum cs35l41_cspl_mbox_cmd cmd);

int cs35l41_write_fs_errata(struct device *dev, struct regmap *regmap);

sound/soc/codecs/cs35l41-lib.c

+24 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>

#include <linux/firmware/cirrus/wmfw.h>



#include <sound/cs35l41.h>
@@ -1225,6 +1226,29 @@ int cs35l41_gpio_config(struct regmap *regmap, struct cs35l41_hw_cfg *hw_cfg) 
}

EXPORT_SYMBOL_GPL(cs35l41_gpio_config);



static const struct cs_dsp_region cs35l41_dsp1_regions[] = {

	{ .type = WMFW_HALO_PM_PACKED,	.base = CS35L41_DSP1_PMEM_0 },

	{ .type = WMFW_HALO_XM_PACKED,	.base = CS35L41_DSP1_XMEM_PACK_0 },

	{ .type = WMFW_HALO_YM_PACKED,	.base = CS35L41_DSP1_YMEM_PACK_0 },

	{. type = WMFW_ADSP2_XM,	.base = CS35L41_DSP1_XMEM_UNPACK24_0},

	{. type = WMFW_ADSP2_YM,	.base = CS35L41_DSP1_YMEM_UNPACK24_0},

};



void cs35l41_configure_cs_dsp(struct device *dev, struct regmap *reg, struct cs_dsp *dsp)

{

	dsp->num = 1;

	dsp->type = WMFW_HALO;

	dsp->rev = 0;

	dsp->dev = dev;

	dsp->regmap = reg;

	dsp->base = CS35L41_DSP1_CTRL_BASE;

	dsp->base_sysinfo = CS35L41_DSP1_SYS_ID;

	dsp->mem = cs35l41_dsp1_regions;

	dsp->num_mems = ARRAY_SIZE(cs35l41_dsp1_regions);

	dsp->lock_regions = 0xFFFFFFFF;

}

EXPORT_SYMBOL_GPL(cs35l41_configure_cs_dsp);



static bool cs35l41_check_cspl_mbox_sts(enum cs35l41_cspl_mbox_cmd cmd,

					enum cs35l41_cspl_mbox_status sts)

{

sound/soc/codecs/cs35l41.c

+2 −18
Original line number Diff line number Diff line
@@ -680,14 +680,6 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { 
	{"CLASS H", NULL, "PCM Source"},

};



static const struct cs_dsp_region cs35l41_dsp1_regions[] = {

	{ .type = WMFW_HALO_PM_PACKED,	.base = CS35L41_DSP1_PMEM_0 },

	{ .type = WMFW_HALO_XM_PACKED,	.base = CS35L41_DSP1_XMEM_PACK_0 },

	{ .type = WMFW_HALO_YM_PACKED,	.base = CS35L41_DSP1_YMEM_PACK_0 },

	{. type = WMFW_ADSP2_XM,	.base = CS35L41_DSP1_XMEM_UNPACK24_0},

	{. type = WMFW_ADSP2_YM,	.base = CS35L41_DSP1_YMEM_UNPACK24_0},

};



static int cs35l41_set_channel_map(struct snd_soc_dai *dai, unsigned int tx_n,

				   unsigned int *tx_slot, unsigned int rx_n, unsigned int *rx_slot)

{
@@ -1100,18 +1092,10 @@ static int cs35l41_dsp_init(struct cs35l41_private *cs35l41) 


	dsp = &cs35l41->dsp;

	dsp->part = "cs35l41";

	dsp->cs_dsp.num = 1;

	dsp->cs_dsp.type = WMFW_HALO;

	dsp->cs_dsp.rev = 0;

	dsp->fw = 9; /* 9 is WM_ADSP_FW_SPK_PROT in wm_adsp.c */

	dsp->toggle_preload = true;

	dsp->cs_dsp.dev = cs35l41->dev;

	dsp->cs_dsp.regmap = cs35l41->regmap;

	dsp->cs_dsp.base = CS35L41_DSP1_CTRL_BASE;

	dsp->cs_dsp.base_sysinfo = CS35L41_DSP1_SYS_ID;

	dsp->cs_dsp.mem = cs35l41_dsp1_regions;

	dsp->cs_dsp.num_mems = ARRAY_SIZE(cs35l41_dsp1_regions);

	dsp->cs_dsp.lock_regions = 0xFFFFFFFF;



	cs35l41_configure_cs_dsp(cs35l41->dev, cs35l41->regmap, &dsp->cs_dsp);



	ret = cs35l41_write_fs_errata(cs35l41->dev, cs35l41->regmap);

	if (ret < 0)