Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "asoc: sdm660: update cpu_dai_name for quin_tdm"

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-25 09:56:55 -07:00 • committed by Gerrit - the friendly Code Review server
commit d36dc15e53
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asoc/sdm660-ext-dai-links.c
View file

@ -1573,7 +1573,7 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = {
{ {
.name = LPASS_BE_QUIN_TDM_RX_0, .name = LPASS_BE_QUIN_TDM_RX_0,
.stream_name = "Quinary TDM0 Playback", .stream_name = "Quinary TDM0 Playback",
.cpu_dai_name = "msm-dai-q6-tdm.37184", .cpu_dai_name = "msm-dai-q6-tdm.36928",
.platform_name = "msm-pcm-routing", .platform_name = "msm-pcm-routing",
.codec_name = "msm-stub-codec.1", .codec_name = "msm-stub-codec.1",
.codec_dai_name = "msm-stub-rx", .codec_dai_name = "msm-stub-rx",
@ -1587,7 +1587,7 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = {
{ {
.name = LPASS_BE_QUIN_TDM_TX_0, .name = LPASS_BE_QUIN_TDM_TX_0,
.stream_name = "Quinary TDM0 Capture", .stream_name = "Quinary TDM0 Capture",
.cpu_dai_name = "msm-dai-q6-tdm.37185", .cpu_dai_name = "msm-dai-q6-tdm.36929",
.platform_name = "msm-pcm-routing", .platform_name = "msm-pcm-routing",
.codec_name = "msm-stub-codec.1", .codec_name = "msm-stub-codec.1",
.codec_dai_name = "msm-stub-tx", .codec_dai_name = "msm-stub-tx",

4
asoc/sdm660-internal.c
View file

@ -2612,7 +2612,7 @@ static struct snd_soc_dai_link msm_int_be_dai[] = {
{ {
.name = LPASS_BE_QUIN_TDM_RX_0, .name = LPASS_BE_QUIN_TDM_RX_0,
.stream_name = "Quinary TDM0 Playback", .stream_name = "Quinary TDM0 Playback",
.cpu_dai_name = "msm-dai-q6-tdm.37184", .cpu_dai_name = "msm-dai-q6-tdm.36928",
.platform_name = "msm-pcm-routing", .platform_name = "msm-pcm-routing",
.codec_name = "msm-stub-codec.1", .codec_name = "msm-stub-codec.1",
.codec_dai_name = "msm-stub-rx", .codec_dai_name = "msm-stub-rx",
@ -2626,7 +2626,7 @@ static struct snd_soc_dai_link msm_int_be_dai[] = {
{ {
.name = LPASS_BE_QUIN_TDM_TX_0, .name = LPASS_BE_QUIN_TDM_TX_0,
.stream_name = "Quinary TDM0 Capture", .stream_name = "Quinary TDM0 Capture",
.cpu_dai_name = "msm-dai-q6-tdm.37185", .cpu_dai_name = "msm-dai-q6-tdm.36929",
.platform_name = "msm-pcm-routing", .platform_name = "msm-pcm-routing",
.codec_name = "msm-stub-codec.1", .codec_name = "msm-stub-codec.1",
.codec_dai_name = "msm-stub-tx", .codec_dai_name = "msm-stub-tx",

2
soc/pinctrl-lpi.c
View file

@ -81,7 +81,7 @@ enum lpi_gpio_func_index {
* @function: See lpi_gpio_functions[] * @function: See lpi_gpio_functions[]
*/ */
struct lpi_gpio_pad { struct lpi_gpio_pad {
u16 offset; u32 offset;
bool output_enabled; bool output_enabled;
bool value; bool value;
char __iomem *base; char __iomem *base;