From 7fccd584b649ce06d528d7d374698f5813a26c41 Mon Sep 17 00:00:00 2001 From: Rohit Kumar Date: Tue, 10 Oct 2017 19:32:44 +0530 Subject: [PATCH 1/2] soc: pinctrl-lpi: update sizeof lpi offset to 32bit Update sizeof lpi register offset to 32 bit to accommodate all register offset for sdm670. Change-Id: I9a3fdb56f9faf6c0aff627cbedaa54db606d2434 Signed-off-by: Rohit Kumar --- soc/pinctrl-lpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soc/pinctrl-lpi.c b/soc/pinctrl-lpi.c index 1e7ead817399..0fa7b60d068f 100644 --- a/soc/pinctrl-lpi.c +++ b/soc/pinctrl-lpi.c @@ -81,7 +81,7 @@ enum lpi_gpio_func_index { * @function: See lpi_gpio_functions[] */ struct lpi_gpio_pad { - u16 offset; + u32 offset; bool output_enabled; bool value; char __iomem *base; From 091ff790319eff74b8cf64b8ec94d263a6f24fd1 Mon Sep 17 00:00:00 2001 From: Rohit kumar Date: Wed, 11 Oct 2017 18:35:07 +0530 Subject: [PATCH 2/2] asoc: sdm660: update cpu_dai_name for quin_tdm Update cpu_dai_name of quin_tdm from tdm group id to port id for sdm670 internal and external codec machine driver to fix soundcard registration issue. Change-Id: I2f7ed4ea983c1d457c4d2940c33f5bb7440ddee6 Signed-off-by: Rohit kumar --- asoc/sdm660-ext-dai-links.c | 4 ++-- asoc/sdm660-internal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asoc/sdm660-ext-dai-links.c b/asoc/sdm660-ext-dai-links.c index 4777a5ff3ee1..a33113550f4c 100644 --- a/asoc/sdm660-ext-dai-links.c +++ b/asoc/sdm660-ext-dai-links.c @@ -1573,7 +1573,7 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = { { .name = LPASS_BE_QUIN_TDM_RX_0, .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", .codec_name = "msm-stub-codec.1", .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, .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", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-tx", diff --git a/asoc/sdm660-internal.c b/asoc/sdm660-internal.c index 713da55cb0a9..a1536fefe635 100644 --- a/asoc/sdm660-internal.c +++ b/asoc/sdm660-internal.c @@ -2612,7 +2612,7 @@ static struct snd_soc_dai_link msm_int_be_dai[] = { { .name = LPASS_BE_QUIN_TDM_RX_0, .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", .codec_name = "msm-stub-codec.1", .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, .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", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-tx",