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.

Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
(cherry picked from commit f993eac79891cf519f7a6ab8df274467aa9b273e)
(cherry picked from commit 3c14d0817579453170d49e3fd2d70b108e135dcc)

Change-Id: I5f21a4a3755a9f43c8d2d90f106dc24710671798
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
This commit is contained in:
Kuirong Wang 2012-09-11 11:47:45 -07:00 committed by Stephen Boyd
parent 4699590504
commit 3589f26bba

View file

@ -2176,7 +2176,8 @@ static int __init msm_audio_init(void)
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;
}