A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-26 06:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: codecs: wcd938x: match slave property to dt"

Browse source
This commit is contained in:
Linux Build Service Account 2019-02-17 00:21:47 -08:00 • committed by Gerrit - the friendly Code Review server
commit 32754ec645
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
asoc/codecs/wcd938x/wcd938x.c
View file

@ -2675,8 +2675,8 @@ struct wcd938x_pdata *wcd938x_populate_dt_data(struct device *dev)
return NULL;
}
pdata->rx_slave = of_parse_phandle(dev->of_node, "qcom,rx-swr-slave", 0);
pdata->tx_slave = of_parse_phandle(dev->of_node, "qcom,tx-swr-slave", 0);
pdata->rx_slave = of_parse_phandle(dev->of_node, "qcom,rx-slave", 0);
pdata->tx_slave = of_parse_phandle(dev->of_node, "qcom,tx-slave", 0);
wcd938x_dt_parse_micbias_info(dev, &pdata->micbias);
@ -2798,7 +2798,7 @@ static int wcd938x_add_slave_components(struct device *dev,
np = dev->of_node;
rx_node = of_parse_phandle(np, "qcom,rx-swr-slave", 0);
rx_node = of_parse_phandle(np, "qcom,rx-slave", 0);
if (!rx_node) {
dev_err(dev, "%s: Rx-slave node not defined\n", __func__);
return -ENODEV;
@ -2809,7 +2809,7 @@ static int wcd938x_add_slave_components(struct device *dev,
wcd938x_compare_of,
rx_node);
tx_node = of_parse_phandle(np, "qcom,tx-swr-slave", 0);
tx_node = of_parse_phandle(np, "qcom,tx-slave", 0);
if (!tx_node) {
dev_err(dev, "%s: Tx-slave node not defined\n", __func__);
return -ENODEV;