Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sound:soc:codecs:ma120x0p.c update and added to defconfigs #3534

Closed
wants to merge 2 commits into from
Closed

sound:soc:codecs:ma120x0p.c update and added to defconfigs #3534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64114d1
add MA120X0P codec to arm defconfigs
AMuszkat Apr 8, 2020
bf91a09
add 96KHz rate support to MA120X0P codec and optional enable and mute…
AMuszkat Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2709_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_CS4271_I2C=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2711_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_CS4271_I2C=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/bcmrpi_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_CS4271_I2C=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/codecs/ma120x0p.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ static struct snd_soc_dai_driver ma120x0p_dai = {
.channels_max = 2,
.rates = SNDRV_PCM_RATE_CONTINUOUS,
.rate_min = 44100,
.rate_max = 48000,
.rate_max = 96000,
.formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE
},
.ops = &ma120x0p_dai_ops,
Expand Down Expand Up @@ -1235,7 +1235,7 @@ static int ma120x0p_i2c_probe(struct i2c_client *i2c,
//Startup sequence

//Make sure the device is muted
priv_data->mute_gpio = devm_gpiod_get(&i2c->dev, "mute_gp",
priv_data->mute_gpio = devm_gpiod_get_optional(&i2c->dev, "mute_gp",
GPIOD_OUT_LOW);
if (IS_ERR(priv_data->mute_gpio)) {
ret = PTR_ERR(priv_data->mute_gpio);
Expand All @@ -1262,7 +1262,7 @@ static int ma120x0p_i2c_probe(struct i2c_client *i2c,
msleep(200);

//Enable ma120x0pp
priv_data->enable_gpio = devm_gpiod_get(&i2c->dev,
priv_data->enable_gpio = devm_gpiod_get_optional(&i2c->dev,
"enable_gp", GPIOD_OUT_LOW);
if (IS_ERR(priv_data->enable_gpio)) {
ret = PTR_ERR(priv_data->enable_gpio);
Expand Down