projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
sound
/
soc
/
fsl
/
fsl_sai.c
diff --git
a/sound/soc/fsl/fsl_sai.c
b/sound/soc/fsl/fsl_sai.c
index 2147994ab46f6826824a3954947ed45285e0baae..9fadf7e31c5f86459efc0b70fb1674f45da5a289 100644
(file)
--- a/
sound/soc/fsl/fsl_sai.c
+++ b/
sound/soc/fsl/fsl_sai.c
@@
-801,8
+801,8
@@
static int fsl_sai_probe(struct platform_device *pdev)
sai->pdev = pdev;
sai->pdev = pdev;
- if (of_device_is_compatible(
pdev->dev.of_node
, "fsl,imx6sx-sai") ||
- of_device_is_compatible(
pdev->dev.of_node
, "fsl,imx6ul-sai"))
+ if (of_device_is_compatible(
np
, "fsl,imx6sx-sai") ||
+ of_device_is_compatible(
np
, "fsl,imx6ul-sai"))
sai->sai_on_imx = true;
sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
sai->sai_on_imx = true;
sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
@@
-883,7
+883,7
@@
static int fsl_sai_probe(struct platform_device *pdev)
}
if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
}
if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
- of_device_is_compatible(
pdev->dev.of_node
, "fsl,imx6ul-sai")) {
+ of_device_is_compatible(
np
, "fsl,imx6ul-sai")) {
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
if (IS_ERR(gpr)) {
dev_err(&pdev->dev, "cannot find iomuxc registers\n");
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
if (IS_ERR(gpr)) {
dev_err(&pdev->dev, "cannot find iomuxc registers\n");
This page took
0.050333 seconds
and
5
git commands to generate.