p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/topology', 'asoc/topic/wm8903' and 'asoc/topic/wm8904' into asoc-next

This commit is contained in:
Mark Brown 2015-12-23 00:23:52 +00:00
parent 14418aa7d4 319c32597f 4b6c56c2f5 b70381c35f 28b5df1838
commit 2d850b1e6c
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/sound/asoc.h
View File

@ -243,7 +243,7 @@ struct snd_soc_tplg_manifest {
__le32 control_elems; /* number of control elements */ __le32 control_elems; /* number of control elements */
__le32 widget_elems; /* number of widget elements */ __le32 widget_elems; /* number of widget elements */
__le32 graph_elems; /* number of graph elements */ __le32 graph_elems; /* number of graph elements */
__le32 dai_elems; /* number of DAI elements */ __le32 pcm_elems; /* number of PCM elements */
__le32 dai_link_elems; /* number of DAI link elements */ __le32 dai_link_elems; /* number of DAI link elements */
struct snd_soc_tplg_private priv; struct snd_soc_tplg_private priv;
} __attribute__((packed)); } __attribute__((packed));

2
sound/soc/codecs/wm8903.c
View File

@ -1804,7 +1804,7 @@ static int wm8903_gpio_get(struct gpio_chip *chip, unsigned offset)
regmap_read(wm8903->regmap, WM8903_GPIO_CONTROL_1 + offset, &reg); regmap_read(wm8903->regmap, WM8903_GPIO_CONTROL_1 + offset, &reg);
return (reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT; return !!((reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT);
} }
static int wm8903_gpio_direction_out(struct gpio_chip *chip, static int wm8903_gpio_direction_out(struct gpio_chip *chip,

2
sound/soc/codecs/wm8904.c
View File

@ -312,7 +312,7 @@ static bool wm8904_readable_register(struct device *dev, unsigned int reg)
case WM8904_FLL_NCO_TEST_1: case WM8904_FLL_NCO_TEST_1:
return true; return true;
default: default:
return true; return false;
} }
} }

12
sound/soc/tegra/tegra_alc5632.c
View File

@ -101,12 +101,16 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = {
static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
{ {
int ret;
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card); struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
&tegra_alc5632_hs_jack, SND_JACK_HEADSET,
tegra_alc5632_hs_jack_pins, &tegra_alc5632_hs_jack,
ARRAY_SIZE(tegra_alc5632_hs_jack_pins)); tegra_alc5632_hs_jack_pins,
ARRAY_SIZE(tegra_alc5632_hs_jack_pins));
if (ret)
return ret;
if (gpio_is_valid(machine->gpio_hp_det)) { if (gpio_is_valid(machine->gpio_hp_det)) {
tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det; tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;