ASoC: apq8064: Enhance the machine type check for apq8064 devices
There are cases that some of apq8064 devices has soc minor version as
1 but not apq8064 i2s device. Add the machine type check to enforce
only mpq8064 and apq8064 I2S devices won't use apq8064 machine driver
and rest of apq8064 devices will keep using apq8064 machine driver.
Change-Id: I58b2b7e7336969176fc0a845b870ae36ee08e015
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
diff --git a/sound/soc/msm/apq8064.c b/sound/soc/msm/apq8064.c
index e46064b..1041818 100644
--- a/sound/soc/msm/apq8064.c
+++ b/sound/soc/msm/apq8064.c
@@ -2036,7 +2036,8 @@
int ret;
u32 version = socinfo_get_platform_version();
if (!cpu_is_apq8064() || (socinfo_get_id() == 130) ||
- SOCINFO_VERSION_MINOR(version) == 1) {
+ (machine_is_apq8064_mtp() &&
+ (SOCINFO_VERSION_MINOR(version) == 1))) {
pr_info("%s: Not APQ8064 in SLIMBUS mode\n", __func__);
return -ENODEV;
}