Unverified Commit 5beb8eea authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: wm_adsp: Rename generic DSP support 



This rename is preparation for moving the generic DSP support out of
ASoC, generic code named wm_* will be renamed to cs_*.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210913160057.103842-6-simont@opensource.cirrus.com


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

sound/soc/codecs/cs47l15.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct cs47l15 { 
	bool in1_lp_mode;

};



static const struct wm_adsp_region cs47l15_dsp1_regions[] = {

static const struct cs_dsp_region cs47l15_dsp1_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x080000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x0e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x0a0000 },
@@ -1413,7 +1413,7 @@ static int cs47l15_probe(struct platform_device *pdev) 
	cs47l15->core.adsp[0].num_mems = ARRAY_SIZE(cs47l15_dsp1_regions);



	cs47l15->core.adsp[0].lock_regions =

		WM_ADSP2_REGION_1 | WM_ADSP2_REGION_2 | WM_ADSP2_REGION_3;

		CS_ADSP2_REGION_1 | CS_ADSP2_REGION_2 | CS_ADSP2_REGION_3;



	ret = wm_adsp2_init(&cs47l15->core.adsp[0]);

	if (ret != 0)

sound/soc/codecs/cs47l24.c

+3 −3
Original line number Diff line number Diff line
@@ -37,21 +37,21 @@ struct cs47l24_priv { 
	struct arizona_fll fll[2];

};



static const struct wm_adsp_region cs47l24_dsp2_regions[] = {

static const struct cs_dsp_region cs47l24_dsp2_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x200000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x280000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x290000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x2a8000 },

};



static const struct wm_adsp_region cs47l24_dsp3_regions[] = {

static const struct cs_dsp_region cs47l24_dsp3_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x300000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x380000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x390000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x3a8000 },

};



static const struct wm_adsp_region *cs47l24_dsp_regions[] = {

static const struct cs_dsp_region *cs47l24_dsp_regions[] = {

	cs47l24_dsp2_regions,

	cs47l24_dsp3_regions,

};

sound/soc/codecs/cs47l35.c

+4 −4
Original line number Diff line number Diff line
@@ -37,28 +37,28 @@ struct cs47l35 { 
	struct madera_fll fll;

};



static const struct wm_adsp_region cs47l35_dsp1_regions[] = {

static const struct cs_dsp_region cs47l35_dsp1_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x080000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x0e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x0a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x0c0000 },

};



static const struct wm_adsp_region cs47l35_dsp2_regions[] = {

static const struct cs_dsp_region cs47l35_dsp2_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x100000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x160000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x120000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x140000 },

};



static const struct wm_adsp_region cs47l35_dsp3_regions[] = {

static const struct cs_dsp_region cs47l35_dsp3_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x180000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x1e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x1a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x1c0000 },

};



static const struct wm_adsp_region *cs47l35_dsp_regions[] = {

static const struct cs_dsp_region *cs47l35_dsp_regions[] = {

	cs47l35_dsp1_regions,

	cs47l35_dsp2_regions,

	cs47l35_dsp3_regions,

sound/soc/codecs/cs47l85.c

+8 −8
Original line number Diff line number Diff line
@@ -37,56 +37,56 @@ struct cs47l85 { 
	struct madera_fll fll[3];

};



static const struct wm_adsp_region cs47l85_dsp1_regions[] = {

static const struct cs_dsp_region cs47l85_dsp1_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x080000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x0e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x0a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x0c0000 },

};



static const struct wm_adsp_region cs47l85_dsp2_regions[] = {

static const struct cs_dsp_region cs47l85_dsp2_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x100000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x160000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x120000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x140000 },

};



static const struct wm_adsp_region cs47l85_dsp3_regions[] = {

static const struct cs_dsp_region cs47l85_dsp3_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x180000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x1e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x1a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x1c0000 },

};



static const struct wm_adsp_region cs47l85_dsp4_regions[] = {

static const struct cs_dsp_region cs47l85_dsp4_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x200000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x260000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x220000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x240000 },

};



static const struct wm_adsp_region cs47l85_dsp5_regions[] = {

static const struct cs_dsp_region cs47l85_dsp5_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x280000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x2e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x2a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x2c0000 },

};



static const struct wm_adsp_region cs47l85_dsp6_regions[] = {

static const struct cs_dsp_region cs47l85_dsp6_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x300000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x360000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x320000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x340000 },

};



static const struct wm_adsp_region cs47l85_dsp7_regions[] = {

static const struct cs_dsp_region cs47l85_dsp7_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x380000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x3e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x3a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x3c0000 },

};



static const struct wm_adsp_region *cs47l85_dsp_regions[] = {

static const struct cs_dsp_region *cs47l85_dsp_regions[] = {

	cs47l85_dsp1_regions,

	cs47l85_dsp2_regions,

	cs47l85_dsp3_regions,

sound/soc/codecs/cs47l90.c

+9 −9
Original line number Diff line number Diff line
@@ -37,56 +37,56 @@ struct cs47l90 { 
	struct madera_fll fll[3];

};



static const struct wm_adsp_region cs47l90_dsp1_regions[] = {

static const struct cs_dsp_region cs47l90_dsp1_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x080000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x0e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x0a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x0c0000 },

};



static const struct wm_adsp_region cs47l90_dsp2_regions[] = {

static const struct cs_dsp_region cs47l90_dsp2_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x100000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x160000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x120000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x140000 },

};



static const struct wm_adsp_region cs47l90_dsp3_regions[] = {

static const struct cs_dsp_region cs47l90_dsp3_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x180000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x1e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x1a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x1c0000 },

};



static const struct wm_adsp_region cs47l90_dsp4_regions[] = {

static const struct cs_dsp_region cs47l90_dsp4_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x200000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x260000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x220000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x240000 },

};



static const struct wm_adsp_region cs47l90_dsp5_regions[] = {

static const struct cs_dsp_region cs47l90_dsp5_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x280000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x2e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x2a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x2c0000 },

};



static const struct wm_adsp_region cs47l90_dsp6_regions[] = {

static const struct cs_dsp_region cs47l90_dsp6_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x300000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x360000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x320000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x340000 },

};



static const struct wm_adsp_region cs47l90_dsp7_regions[] = {

static const struct cs_dsp_region cs47l90_dsp7_regions[] = {

	{ .type = WMFW_ADSP2_PM, .base = 0x380000 },

	{ .type = WMFW_ADSP2_ZM, .base = 0x3e0000 },

	{ .type = WMFW_ADSP2_XM, .base = 0x3a0000 },

	{ .type = WMFW_ADSP2_YM, .base = 0x3c0000 },

};



static const struct wm_adsp_region *cs47l90_dsp_regions[] = {

static const struct cs_dsp_region *cs47l90_dsp_regions[] = {

	cs47l90_dsp1_regions,

	cs47l90_dsp2_regions,

	cs47l90_dsp3_regions,
@@ -2554,7 +2554,7 @@ static int cs47l90_probe(struct platform_device *pdev) 
		cs47l90->core.adsp[i].num_mems =

			ARRAY_SIZE(cs47l90_dsp1_regions);



		cs47l90->core.adsp[i].lock_regions = WM_ADSP2_REGION_1_9;

		cs47l90->core.adsp[i].lock_regions = CS_ADSP2_REGION_1_9;



		ret = wm_adsp2_init(&cs47l90->core.adsp[i]);