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

Commit fc3ba81a authored by John Hsu's avatar John Hsu Committed by Mark Brown
Browse files

ASoC: nau8825: change crosstalk-bypass property to bool type 



The property type of "nuvoton,crosstalk-bypass" changes to boolean.
The document is updated as well.

Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarJohn Hsu <supercraig0719@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 812a5326

Documentation/devicetree/bindings/sound/nau8825.txt

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ Optional properties: 
  - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms

  - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms



  - nuvoton,crosstalk-bypass: make crosstalk function bypass if set.



  - clocks: list of phandle and clock specifier pairs according to common clock bindings for the

      clocks described in clock-names

  - clock-names: should include "mclk" for the MCLK master clock
@@ -96,6 +98,7 @@ Example: 
      nuvoton,short-key-debounce = <2>;

      nuvoton,jack-insert-debounce = <7>;

      nuvoton,jack-eject-debounce = <7>;

      nuvoton,crosstalk-bypass;



      clock-names = "mclk";

      clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;

sound/soc/codecs/nau8825.c

+2 −4
Original line number Diff line number Diff line
@@ -2506,10 +2506,8 @@ static int nau8825_read_device_properties(struct device *dev, 
		&nau8825->jack_eject_debounce);

	if (ret)

		nau8825->jack_eject_debounce = 0;

	ret = device_property_read_u32(dev, "nuvoton,crosstalk-bypass",

		&nau8825->xtalk_bypass);

	if (ret)

		nau8825->xtalk_bypass = 1;

	nau8825->xtalk_bypass = device_property_read_bool(dev,

		"nuvoton,crosstalk-bypass");



	nau8825->mclk = devm_clk_get(dev, "mclk");

	if (PTR_ERR(nau8825->mclk) == -EPROBE_DEFER) {