Changes to accomodate "ENGR00305648-1 ASoC: imx-sgtl5000: Support non-ssi cpu-dai" in wandboard code

chrillomat · chrillomat · commit 67211599f2f6 · 2014-10-06T23:04:01.000+02:00
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -65,7 +65,7 @@
 		compatible = "fsl,imx6-wandboard-sgtl5000", 
                              "fsl,imx-audio-sgtl5000";
 		model = "imx6-wandboard-sgtl5000";
-		ssi-controller = <&ssi1>;
+		cpu-dai = <&ssi1>;
 		audio-codec = <&codec>;
 		audio-routing =
 			"MIC_IN", "Mic Jack",
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
@@ -177,7 +177,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	}
 
 	platform_set_drvdata(pdev, data);
-	of_node_put(ssi_np);
+	//of_node_put(ssi_np);
 	of_node_put(codec_np);
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`platform_set_drvdata(pdev, data);`
`180`		`- of_node_put(ssi_np);`
	`180`	`+ //of_node_put(ssi_np);`
`181`	`181`	`of_node_put(codec_np);`
`182`	`182`
`183`	`183`	`return 0;`