From 65fae1ab0ee0274af3cf3e717bef8e42dbad76fb Mon Sep 17 00:00:00 2001 From: "Yoon (Seungyoon) Lee" Date: Wed, 26 Dec 2018 00:19:58 -0600 Subject: [PATCH] ASoC: wm_adsp: use new 'cirrus' node We have Kane only in this new platform so far and this is good chance to transit to use new 'cirrus' node instead of old 'wlf' node since we don't have any old products dt in this branch yet. Change-Id: I31f883043913f287da62f8a39ca6a828c2b5da3a Signed-off-by: Yoon (Seungyoon) Lee Reviewed-on: https://gerrit.mot.com/1287049 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhengming Yao Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- sound/soc/codecs/wm_adsp.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 6e535fe3a43b..d772032c8d2e 100755 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -3952,22 +3952,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) { -- 2.20.1