aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-08 11:59:46 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-09 06:38:12 -0500
commit2b81ec69144de93f29fa258d3435557a5773ffb5 (patch)
treef5d563ede6fdbef43fec6249ad266a644aa5ba56 /sound/soc/fsl/fsl_ssi.c
parent5b596483936230b926898efe10f9cc258d5ed092 (diff)
ASoC: fsl: check property 'compatible' for the machine name
Check /compatible rather than /model to determine the machine name. The p1022ds older device trees get a different /model from the new ones, while /compatible is consistent there, so checking /compatible will save the bother of detecting older p1022ds device trees. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r--sound/soc/fsl/fsl_ssi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 3e066966d878..2eb407fa3b48 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -716,12 +716,12 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
716 } 716 }
717 717
718 /* Trigger the machine driver's probe function. The platform driver 718 /* Trigger the machine driver's probe function. The platform driver
719 * name of the machine driver is taken from the /model property of the 719 * name of the machine driver is taken from /compatible property of the
720 * device tree. We also pass the address of the CPU DAI driver 720 * device tree. We also pass the address of the CPU DAI driver
721 * structure. 721 * structure.
722 */ 722 */
723 sprop = of_get_property(of_find_node_by_path("/"), "model", NULL); 723 sprop = of_get_property(of_find_node_by_path("/"), "compatible", NULL);
724 /* Sometimes the model name has a "fsl," prefix, so we strip that. */ 724 /* Sometimes the compatible name has a "fsl," prefix, so we strip it. */
725 p = strrchr(sprop, ','); 725 p = strrchr(sprop, ',');
726 if (p) 726 if (p)
727 sprop = p + 1; 727 sprop = p + 1;