Commit 804f5ba7 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm5102: Hook up DSP1 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0b09df66

sound/soc/codecs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -148,7 +148,9 @@ config SND_SOC_WM_HUBS 


config SND_SOC_WM_ADSP

	tristate

	default y if SND_SOC_WM5102=y

	default y if SND_SOC_WM2200=y

	default m if SND_SOC_WM5102=m

	default m if SND_SOC_WM2200=m



config SND_SOC_AB8500_CODEC

sound/soc/codecs/wm5102.c

+37 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include "arizona.h"

#include "wm5102.h"

#include "wm_adsp.h"



struct wm5102_priv {

	struct arizona_priv core;
@@ -42,6 +43,13 @@ static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); 
static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);

static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0);



static const struct wm_adsp_region wm5102_dsp1_regions[] = {

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

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

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

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

};



static const struct snd_kcontrol_new wm5102_snd_controls[] = {

SOC_SINGLE("IN1 High Performance Switch", ARIZONA_IN1L_CONTROL,

	   ARIZONA_IN1_OSR_SHIFT, 1, 0),
@@ -137,6 +145,9 @@ ARIZONA_MIXER_CONTROLS("LHPF2", ARIZONA_HPLP2MIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("LHPF3", ARIZONA_HPLP3MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("LHPF4", ARIZONA_HPLP4MIX_INPUT_1_SOURCE),



ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),



SOC_ENUM("LHPF1 Mode", arizona_lhpf1_mode),

SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),

SOC_ENUM("LHPF3 Mode", arizona_lhpf3_mode),
@@ -274,6 +285,10 @@ ARIZONA_MIXER_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE); 
ARIZONA_MIXER_ENUMS(ASRC2L, ARIZONA_ASRC2LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(ASRC2R, ARIZONA_ASRC2RMIX_INPUT_1_SOURCE);



ARIZONA_MIXER_ENUMS(DSP1L, ARIZONA_DSP1LMIX_INPUT_1_SOURCE);

ARIZONA_MIXER_ENUMS(DSP1R, ARIZONA_DSP1RMIX_INPUT_1_SOURCE);



ARIZONA_DSP_AUX_ENUMS(DSP1, ARIZONA_DSP1AUX1MIX_INPUT_1_SOURCE);



static const char *wm5102_aec_loopback_texts[] = {

	"HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "EPOUT",
@@ -446,6 +461,8 @@ SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, 
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),



WM_ADSP2("DSP1", 0),



SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,

		       ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux),
@@ -526,6 +543,8 @@ ARIZONA_MIXER_WIDGETS(ASRC1R, "ASRC1R"), 
ARIZONA_MIXER_WIDGETS(ASRC2L, "ASRC2L"),

ARIZONA_MIXER_WIDGETS(ASRC2R, "ASRC2R"),



WM_ADSP2("DSP1", 0),



SND_SOC_DAPM_OUTPUT("HPOUT1L"),

SND_SOC_DAPM_OUTPUT("HPOUT1R"),

SND_SOC_DAPM_OUTPUT("HPOUT2L"),
@@ -577,7 +596,13 @@ SND_SOC_DAPM_OUTPUT("SPKDAT1R"), 
	{ name, "ASRC1L", "ASRC1L" }, \

	{ name, "ASRC1R", "ASRC1R" }, \

	{ name, "ASRC2L", "ASRC2L" }, \

	{ name, "ASRC2R", "ASRC2R" }

	{ name, "ASRC2R", "ASRC2R" }, \

	{ name, "DSP1.1", "DSP1" }, \

	{ name, "DSP1.2", "DSP1" }, \

	{ name, "DSP1.3", "DSP1" }, \

	{ name, "DSP1.4", "DSP1" }, \

	{ name, "DSP1.5", "DSP1" }, \

	{ name, "DSP1.6", "DSP1" }



static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {

	{ "AIF2 Capture", NULL, "DBVDD2" },
@@ -710,6 +735,8 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { 
	ARIZONA_MIXER_ROUTES("ASRC2L", "ASRC2L"),

	ARIZONA_MIXER_ROUTES("ASRC2R", "ASRC2R"),



	ARIZONA_DSP_ROUTES("DSP1"),



	{ "AEC Loopback", "HPOUT1L", "OUT1L" },

	{ "AEC Loopback", "HPOUT1R", "OUT1R" },

	{ "HPOUT1L", NULL, "OUT1L" },
@@ -884,6 +911,15 @@ static int __devinit wm5102_probe(struct platform_device *pdev) 


	wm5102->core.arizona = arizona;



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

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

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

	wm5102->core.adsp[0].base = ARIZONA_DSP1_CONTROL_1;

	wm5102->core.adsp[0].dev = arizona->dev;

	wm5102->core.adsp[0].regmap = arizona->regmap;

	wm5102->core.adsp[0].mem = wm5102_dsp1_regions;

	wm5102->core.adsp[0].num_mems = ARRAY_SIZE(wm5102_dsp1_regions);



	for (i = 0; i < ARRAY_SIZE(wm5102->fll); i++)

		wm5102->fll[i].vco_mult = 1;