Unverified Commit 22e51dbb authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: cs35l56: Move cs_dsp init into shared library 



Move the code that initialized the struct cs_dsp members
into the shared library so that the HDA driver can use it.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230721132120.5523-7-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9974d5b5

include/sound/cs35l56.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ extern struct regmap_config cs35l56_regmap_i2c; 
extern struct regmap_config cs35l56_regmap_spi;

extern struct regmap_config cs35l56_regmap_sdw;



extern const struct cs_dsp_region cs35l56_dsp1_regions[CS35L56_NUM_DSP_REGIONS];

extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];

extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];
@@ -283,6 +282,7 @@ irqreturn_t cs35l56_irq(int irq, void *data); 
int cs35l56_is_fw_reload_needed(struct cs35l56_base *cs35l56_base);

int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base);

int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_soundwire);

void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);

int cs35l56_get_bclk_freq_id(unsigned int freq);

void cs35l56_fill_supply_names(struct regulator_bulk_data *data);

sound/soc/codecs/cs35l56-shared.c

+16 −2
Original line number Diff line number Diff line
@@ -521,14 +521,28 @@ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_sou 
}

EXPORT_SYMBOL_NS_GPL(cs35l56_runtime_resume_common, SND_SOC_CS35L56_SHARED);



const struct cs_dsp_region cs35l56_dsp1_regions[] = {

static const struct cs_dsp_region cs35l56_dsp1_regions[] = {

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

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

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

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

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

};

EXPORT_SYMBOL_NS_GPL(cs35l56_dsp1_regions, SND_SOC_CS35L56_SHARED);



void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp)

{

	cs_dsp->num = 1;

	cs_dsp->type = WMFW_HALO;

	cs_dsp->rev = 0;

	cs_dsp->dev = cs35l56_base->dev;

	cs_dsp->regmap = cs35l56_base->regmap;

	cs_dsp->base = CS35L56_DSP1_CORE_BASE;

	cs_dsp->base_sysinfo = CS35L56_DSP1_SYS_INFO_ID;

	cs_dsp->mem = cs35l56_dsp1_regions;

	cs_dsp->num_mems = ARRAY_SIZE(cs35l56_dsp1_regions);

	cs_dsp->no_core_startstop = true;

}

EXPORT_SYMBOL_NS_GPL(cs35l56_init_cs_dsp, SND_SOC_CS35L56_SHARED);



static const u32 cs35l56_bclk_valid_for_pll_freq_table[] = {

	[0x0C] = 128000,

sound/soc/codecs/cs35l56.c

+1 −10
Original line number Diff line number Diff line
@@ -1016,18 +1016,9 @@ static int cs35l56_dsp_init(struct cs35l56_private *cs35l56) 
	INIT_WORK(&cs35l56->dsp_work, cs35l56_dsp_work);



	dsp = &cs35l56->dsp;

	cs35l56_init_cs_dsp(&cs35l56->base, &dsp->cs_dsp);

	dsp->part = "cs35l56";

	dsp->cs_dsp.num = 1;

	dsp->cs_dsp.type = WMFW_HALO;

	dsp->cs_dsp.rev = 0;

	dsp->fw = 12;

	dsp->cs_dsp.dev = cs35l56->base.dev;

	dsp->cs_dsp.regmap = cs35l56->base.regmap;

	dsp->cs_dsp.base = CS35L56_DSP1_CORE_BASE;

	dsp->cs_dsp.base_sysinfo = CS35L56_DSP1_SYS_INFO_ID;

	dsp->cs_dsp.mem = cs35l56_dsp1_regions;

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

	dsp->cs_dsp.no_core_startstop = true;

	dsp->wmfw_optional = true;



	dev_dbg(cs35l56->base.dev, "DSP system name: '%s'\n", dsp->system_name);