From 89bf53a666df7a98151b2e7b981b89ed16d8eea8 Mon Sep 17 00:00:00 2001 From: Deru Wang Date: Wed, 21 Oct 2020 17:31:24 +0800 Subject: [PATCH 1/2] asoc: fix the punctuation error of sa6155 fix the compilation failure due to punctuation error for sa6155 Change-Id: If6209008ccbdc17ba34e4a598eca869747eed3d5 Signed-off-by: Deru Wang --- asoc/sa6155.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asoc/sa6155.c b/asoc/sa6155.c index 15298f9d0e01..d85c55d9d15e 100644 --- a/asoc/sa6155.c +++ b/asoc/sa6155.c @@ -1334,7 +1334,7 @@ static int tdm_get_sample_rate(int value) sample_rate = SAMPLING_RATE_352P8KHZ; break; case 6: - sample_rate = SAMPLING_RATE_44P1KHZ: + sample_rate = SAMPLING_RATE_44P1KHZ; break; case 7: sample_rate = SAMPLING_RATE_96KHZ; From f7990a724866302dd282b2bb3c2bd05e3beb5cb4 Mon Sep 17 00:00:00 2001 From: Deru Wang Date: Wed, 21 Oct 2020 22:03:06 +0800 Subject: [PATCH 2/2] asoc: fix compile issue due to soundwire Change-Id: Ia4996026b95ee5b3fe693c279147205a7f0894b3 Signed-off-by: Deru Wang --- config/sa6155auto.conf | 1 + config/sa6155autoconf.h | 1 + 2 files changed, 2 insertions(+) diff --git a/config/sa6155auto.conf b/config/sa6155auto.conf index 4dbbb0b35f70..39dfa98ea7f1 100644 --- a/config/sa6155auto.conf +++ b/config/sa6155auto.conf @@ -13,5 +13,6 @@ CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m CONFIG_MSM_QDSP6V2_CODECS=m CONFIG_SND_SOC_QDSP6V2=m CONFIG_SND_SOC_SA6155=m +CONFIG_SOUNDWIRE=m CONFIG_SOUNDWIRE_MSTR_CTRL=m CONFIG_SND_EVENT=m diff --git a/config/sa6155autoconf.h b/config/sa6155autoconf.h index e5c9b3353b62..8b6846cc9de1 100644 --- a/config/sa6155autoconf.h +++ b/config/sa6155autoconf.h @@ -25,5 +25,6 @@ #define CONFIG_MSM_QDSP6V2_CODECS 1 #define CONFIG_SND_SOC_QDSP6V2 1 #define CONFIG_SND_SOC_SA6155 1 +#define CONFIG_SOUNDWIRE 1 #define CONFIG_SOUNDWIRE_MSTR_CTRL 1 #define CONFIG_SND_EVENT 1