| Message ID | 20200425184657.121991-1-stephan@gerhold.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d5797ede0818b24252f79497e1c7e1245c328f6b |
| Headers | show |
| Series | [v2,1/2] dt-bindings: sound: lpass-cpu: Document DAI subnodes | expand |
On Sat, 25 Apr 2020 20:46:56 +0200, Stephan Gerhold wrote: > The lpass-cpu driver now allows configuring the MI2S SD lines > by defining subnodes for one of the DAIs. > > Document this in the device tree bindings. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8 Thanks! [1/2] dt-bindings: sound: lpass-cpu: Document DAI subnodes commit: d5797ede0818b24252f79497e1c7e1245c328f6b [2/2] ASoC: qcom: lpass-cpu: Make I2S SD lines configurable commit: 4ff028f6c1087bcaf1ee970d4ef43730ed0aaa8c 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
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt index 21c648328be9..32c2cdb3d32f 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt @@ -30,6 +30,8 @@ Required properties: - reg : Must contain an address for each entry in reg-names. - reg-names : A list which must include the following entries: * "lpass-lpaif" +- #address-cells : Must be 1 +- #size-cells : Must be 0 @@ -37,6 +39,20 @@ Optional properties: - qcom,adsp : Phandle for the audio DSP node +By default, the driver uses up to 4 MI2S SD lines, for a total of 8 channels. +The SD lines to use can be configured by adding subnodes for each of the DAIs. + +Required properties for each DAI (represented by a subnode): +- reg : Must be one of the DAI IDs + (usually part of dt-bindings header) +- qcom,playback-sd-lines: List of serial data lines to use for playback + Each SD line should be represented by a number from 0-3. +- qcom,capture-sd-lines : List of serial data lines to use for capture + Each SD line should be represented by a number from 0-3. + +Note that adding a subnode changes the default to "no lines configured", +so both playback and capture lines should be configured when a subnode is added. + Example: lpass@28100000 { @@ -51,4 +67,13 @@ lpass@28100000 { reg = <0x28100000 0x10000>; reg-names = "lpass-lpaif"; qcom,adsp = <&adsp>; + + #address-cells = <1>; + #size-cells = <0>; + + /* Optional to set different MI2S SD lines */ + dai@3 { + reg = <MI2S_QUATERNARY>; + qcom,playback-sd-lines = <0 1>; + }; };
The lpass-cpu driver now allows configuring the MI2S SD lines by defining subnodes for one of the DAIs. Document this in the device tree bindings. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- Changes in v2: - Clarify number of entries for qcom,playback/capture-sd-lines - Suggest more generic node names (dai@...) for children DAI device nodes v1: https://lore.kernel.org/alsa-devel/20200406135608.126171-1-stephan@gerhold.net/ --- .../bindings/sound/qcom,lpass-cpu.txt | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)