Revert "ASoC: wm_adsp: Add support for old DTS config"

We have River and Olson only in DLKM kernel so far and this is good
timing to transit to use new 'cirrus' node instead of old 'wlf' node
since we don't have lots of old products dt in this kernel branch yet.

(This reverts commit 05d11bc217e6a46f67be0c8d9c635feba9a45d78.)

Mot-CR-fixed: (CR)
Change-Id: Ideed9b83314f06fb0058af7d2cb311b1347dec75
Signed-off-by: Yoon (Seungyoon) Lee <w22905@motorola.com>
Reviewed-on: https://gerrit.mot.com/1255127
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Patrick Gries <patgries@motorola.com>
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Yoon (Seungyoon) Lee 2018-10-12 15:22:26 -05:00 • committed by Seungyoon Lee
commit 3ce95b718f

View file

@ -3944,22 +3944,6 @@ static int wm_adsp_of_parse_firmware(struct wm_adsp *dsp,
while ((fw = of_get_next_child(fws, fw)) != NULL) {
ctl_names[i] = fw->name;
/* check for old dts configuration */
ret = of_property_read_string(fw, "wlf,wmfw-file",
&dsp->firmwares[i].file);
if (ret == 0) {
ret = of_property_read_string(fw, "wlf,bin-file",
&dsp->firmwares[i].binfile);
if (ret < 0)
dsp->firmwares[i].binfile = NULL;
dsp->firmwares[i].fullname = true;
dsp->firmwares[i].compr_direction = SND_COMPRESS_CAPTURE;
dsp->firmwares[i].num_caps = ARRAY_SIZE(trace_caps);
dsp->firmwares[i].caps = trace_caps;
i++;
continue;
}
ret = of_property_read_string(fw, "cirrus,wmfw-file",
&dsp->firmwares[i].file);
if (ret < 0) {