Applied "ASoC: nau8825: change crosstalk-bypass property to bool type" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: nau8825: change crosstalk-bypass property to bool type
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
fc3ba81a5adac413312019413c91b1e6a5d8d1faMon Sep 17 00:00:00 2001
From: John Hsu <[email protected]>
Date: Thu, 29 Jun 2017 11:41:30 +0800
Subject: [PATCH] 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.
--- Documentation/devicetree/bindings/sound/nau8825.txt | 3 +++ sound/soc/codecs/nau8825.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/sound/nau8825.txt +3 -0
@@ -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
@@ -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 ) {
Signature · 1 line
2.13.2