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

ASoC: wm_adsp: Split out struct cs_dsp from struct wm_adsp 



In preparation for moving the generic DSP support out of ASoC split
struct wm_adsp into two parts, one will form the structure for the new
generic DSP code and embed that one into wm_adsp.

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-15-simont@opensource.cirrus.com


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

sound/soc/codecs/cs47l15.c

+9 −9
Original line number Diff line number Diff line
@@ -1402,17 +1402,17 @@ static int cs47l15_probe(struct platform_device *pdev) 
		dev_warn(&pdev->dev, "Failed to set DSP IRQ wake: %d\n", ret);



	cs47l15->core.adsp[0].part = "cs47l15";

	cs47l15->core.adsp[0].num = 1;

	cs47l15->core.adsp[0].type = WMFW_ADSP2;

	cs47l15->core.adsp[0].rev = 2;

	cs47l15->core.adsp[0].dev = madera->dev;

	cs47l15->core.adsp[0].regmap = madera->regmap_32bit;

	cs47l15->core.adsp[0].cs_dsp.num = 1;

	cs47l15->core.adsp[0].cs_dsp.type = WMFW_ADSP2;

	cs47l15->core.adsp[0].cs_dsp.rev = 2;

	cs47l15->core.adsp[0].cs_dsp.dev = madera->dev;

	cs47l15->core.adsp[0].cs_dsp.regmap = madera->regmap_32bit;



	cs47l15->core.adsp[0].base = MADERA_DSP1_CONFIG_1;

	cs47l15->core.adsp[0].mem = cs47l15_dsp1_regions;

	cs47l15->core.adsp[0].num_mems = ARRAY_SIZE(cs47l15_dsp1_regions);

	cs47l15->core.adsp[0].cs_dsp.base = MADERA_DSP1_CONFIG_1;

	cs47l15->core.adsp[0].cs_dsp.mem = cs47l15_dsp1_regions;

	cs47l15->core.adsp[0].cs_dsp.num_mems = ARRAY_SIZE(cs47l15_dsp1_regions);



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

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

		CS_ADSP2_REGION_1 | CS_ADSP2_REGION_2 | CS_ADSP2_REGION_3;



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

sound/soc/codecs/cs47l24.c

+7 −7
Original line number Diff line number Diff line
@@ -1234,15 +1234,15 @@ static int cs47l24_probe(struct platform_device *pdev) 


	for (i = 1; i <= 2; i++) {

		cs47l24->core.adsp[i].part = "cs47l24";

		cs47l24->core.adsp[i].num = i + 1;

		cs47l24->core.adsp[i].type = WMFW_ADSP2;

		cs47l24->core.adsp[i].dev = arizona->dev;

		cs47l24->core.adsp[i].regmap = arizona->regmap;

		cs47l24->core.adsp[i].cs_dsp.num = i + 1;

		cs47l24->core.adsp[i].cs_dsp.type = WMFW_ADSP2;

		cs47l24->core.adsp[i].cs_dsp.dev = arizona->dev;

		cs47l24->core.adsp[i].cs_dsp.regmap = arizona->regmap;



		cs47l24->core.adsp[i].base = ARIZONA_DSP1_CONTROL_1 +

		cs47l24->core.adsp[i].cs_dsp.base = ARIZONA_DSP1_CONTROL_1 +

					     (0x100 * i);

		cs47l24->core.adsp[i].mem = cs47l24_dsp_regions[i - 1];

		cs47l24->core.adsp[i].num_mems =

		cs47l24->core.adsp[i].cs_dsp.mem = cs47l24_dsp_regions[i - 1];

		cs47l24->core.adsp[i].cs_dsp.num_mems =

				ARRAY_SIZE(cs47l24_dsp2_regions);



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

sound/soc/codecs/cs47l35.c

+9 −9
Original line number Diff line number Diff line
@@ -1686,15 +1686,15 @@ static int cs47l35_probe(struct platform_device *pdev) 


	for (i = 0; i < CS47L35_NUM_ADSP; i++) {

		cs47l35->core.adsp[i].part = "cs47l35";

		cs47l35->core.adsp[i].num = i + 1;

		cs47l35->core.adsp[i].type = WMFW_ADSP2;

		cs47l35->core.adsp[i].rev = 1;

		cs47l35->core.adsp[i].dev = madera->dev;

		cs47l35->core.adsp[i].regmap = madera->regmap_32bit;



		cs47l35->core.adsp[i].base = wm_adsp2_control_bases[i];

		cs47l35->core.adsp[i].mem = cs47l35_dsp_regions[i];

		cs47l35->core.adsp[i].num_mems =

		cs47l35->core.adsp[i].cs_dsp.num = i + 1;

		cs47l35->core.adsp[i].cs_dsp.type = WMFW_ADSP2;

		cs47l35->core.adsp[i].cs_dsp.rev = 1;

		cs47l35->core.adsp[i].cs_dsp.dev = madera->dev;

		cs47l35->core.adsp[i].cs_dsp.regmap = madera->regmap_32bit;



		cs47l35->core.adsp[i].cs_dsp.base = wm_adsp2_control_bases[i];

		cs47l35->core.adsp[i].cs_dsp.mem = cs47l35_dsp_regions[i];

		cs47l35->core.adsp[i].cs_dsp.num_mems =

			ARRAY_SIZE(cs47l35_dsp1_regions);



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

sound/soc/codecs/cs47l85.c

+9 −9
Original line number Diff line number Diff line
@@ -2632,15 +2632,15 @@ static int cs47l85_probe(struct platform_device *pdev) 


	for (i = 0; i < CS47L85_NUM_ADSP; i++) {

		cs47l85->core.adsp[i].part = "cs47l85";

		cs47l85->core.adsp[i].num = i + 1;

		cs47l85->core.adsp[i].type = WMFW_ADSP2;

		cs47l85->core.adsp[i].rev = 1;

		cs47l85->core.adsp[i].dev = madera->dev;

		cs47l85->core.adsp[i].regmap = madera->regmap_32bit;



		cs47l85->core.adsp[i].base = wm_adsp2_control_bases[i];

		cs47l85->core.adsp[i].mem = cs47l85_dsp_regions[i];

		cs47l85->core.adsp[i].num_mems =

		cs47l85->core.adsp[i].cs_dsp.num = i + 1;

		cs47l85->core.adsp[i].cs_dsp.type = WMFW_ADSP2;

		cs47l85->core.adsp[i].cs_dsp.rev = 1;

		cs47l85->core.adsp[i].cs_dsp.dev = madera->dev;

		cs47l85->core.adsp[i].cs_dsp.regmap = madera->regmap_32bit;



		cs47l85->core.adsp[i].cs_dsp.base = wm_adsp2_control_bases[i];

		cs47l85->core.adsp[i].cs_dsp.mem = cs47l85_dsp_regions[i];

		cs47l85->core.adsp[i].cs_dsp.num_mems =

			ARRAY_SIZE(cs47l85_dsp1_regions);



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

sound/soc/codecs/cs47l90.c

+10 −10
Original line number Diff line number Diff line
@@ -2543,18 +2543,18 @@ static int cs47l90_probe(struct platform_device *pdev) 


	for (i = 0; i < CS47L90_NUM_ADSP; i++) {

		cs47l90->core.adsp[i].part = "cs47l90";

		cs47l90->core.adsp[i].num = i + 1;

		cs47l90->core.adsp[i].type = WMFW_ADSP2;

		cs47l90->core.adsp[i].rev = 2;

		cs47l90->core.adsp[i].dev = madera->dev;

		cs47l90->core.adsp[i].regmap = madera->regmap_32bit;



		cs47l90->core.adsp[i].base = cs47l90_dsp_control_bases[i];

		cs47l90->core.adsp[i].mem = cs47l90_dsp_regions[i];

		cs47l90->core.adsp[i].num_mems =

		cs47l90->core.adsp[i].cs_dsp.num = i + 1;

		cs47l90->core.adsp[i].cs_dsp.type = WMFW_ADSP2;

		cs47l90->core.adsp[i].cs_dsp.rev = 2;

		cs47l90->core.adsp[i].cs_dsp.dev = madera->dev;

		cs47l90->core.adsp[i].cs_dsp.regmap = madera->regmap_32bit;



		cs47l90->core.adsp[i].cs_dsp.base = cs47l90_dsp_control_bases[i];

		cs47l90->core.adsp[i].cs_dsp.mem = cs47l90_dsp_regions[i];

		cs47l90->core.adsp[i].cs_dsp.num_mems =

			ARRAY_SIZE(cs47l90_dsp1_regions);



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

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



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