Skip to content

Commit

Permalink
ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as boolean
Browse files Browse the repository at this point in the history
Handle the jack detection inforamtion as bool from devicetree.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Nov 28, 2012
1 parent e650794 commit 1c08e7e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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>;
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/omap/omap-abe-twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 1c08e7e

Please sign in to comment.