Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c08e7e3 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as boolean 



Handle the jack detection inforamtion as bool from devicetree.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e650794a

Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 


Optional properties:

- ti,dmic: phandle for the OMAP dmic node if the machine have it connected

- ti,jack_detection: Need to be set to <1> if the board capable to detect jack

- ti,jack_detection: Need to be present if the board capable to detect jack

  insertion, removal.



Available audio endpoints for the audio-routing table:
@@ -59,7 +59,7 @@ sound { 
	compatible = "ti,abe-twl6040";

	ti,model = "SDP4430";



	ti,jack-detection = <1>;

	ti,jack-detection;

	ti,mclk-freq = <38400000>;



	ti,mcpdm = <&mcpdm>;

sound/soc/omap/omap-abe-twl6040.c

+2 −2
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ static __devinit int omap_abe_probe(struct platform_device *pdev) 
			num_links = 1;

		}



		of_property_read_u32(node, "ti,jack-detection",

				     &priv->jack_detection);

		priv->jack_detection = of_property_read_bool(node,

							   "ti,jack-detection");

		of_property_read_u32(node, "ti,mclk-freq",

				     &priv->mclk_freq);

		if (!priv->mclk_freq) {