Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 141bc6a6 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Correct types of mixer texts and values 



The core expects "const char * const" and "unsigned int" for enum
controls, various places in Arizona use "const char *" and "int".
This patch corrects the type of these arrays.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 800f297e

sound/soc/codecs/arizona.c

+4 −4
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ int arizona_init_gpio(struct snd_soc_codec *codec) 
}

EXPORT_SYMBOL_GPL(arizona_init_gpio);



const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {

const char * const arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {

	"None",

	"Tone Generator 1",

	"Tone Generator 2",
@@ -418,7 +418,7 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = { 
};

EXPORT_SYMBOL_GPL(arizona_mixer_texts);



int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = {

unsigned int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = {

	0x00,  /* None */

	0x04,  /* Tone */

	0x05,
@@ -555,12 +555,12 @@ const char *arizona_sample_rate_val_to_name(unsigned int rate_val) 
}

EXPORT_SYMBOL_GPL(arizona_sample_rate_val_to_name);



const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE] = {

const char * const arizona_rate_text[ARIZONA_RATE_ENUM_SIZE] = {

	"SYNCCLK rate", "8kHz", "16kHz", "ASYNCCLK rate",

};

EXPORT_SYMBOL_GPL(arizona_rate_text);



const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE] = {

const unsigned int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE] = {

	0, 1, 2, 8,

};

EXPORT_SYMBOL_GPL(arizona_rate_val);

sound/soc/codecs/arizona.h

+4 −4
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ struct arizona_priv { 
#define ARIZONA_NUM_MIXER_INPUTS 104



extern const unsigned int arizona_mixer_tlv[];

extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS];

extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];

extern const char * const arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS];

extern unsigned int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];



#define ARIZONA_GAINMUX_CONTROLS(name, base) \

	SOC_SINGLE_RANGE_TLV(name " Input Volume", base + 1,		\
@@ -216,8 +216,8 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
#define ARIZONA_RATE_ENUM_SIZE 4

#define ARIZONA_SAMPLE_RATE_ENUM_SIZE 14



extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];

extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE];

extern const char * const arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];

extern const unsigned int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE];

extern const char * const arizona_sample_rate_text[ARIZONA_SAMPLE_RATE_ENUM_SIZE];

extern const unsigned int arizona_sample_rate_val[ARIZONA_SAMPLE_RATE_ENUM_SIZE];