-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/qcom', …
…'asoc/topic/rcar' and 'asoc/topic/rt286' into asoc-next
- Loading branch information
Showing
29 changed files
with
3,186 additions
and
528 deletions.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| * Qualcomm Technologies LPASS CPU DAI | ||
|
|
||
| This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "qcom,lpass-cpu" | ||
| - clocks : Must contain an entry for each entry in clock-names. | ||
| - clock-names : A list which must include the following entries: | ||
| * "ahbix-clk" | ||
| * "mi2s-osr-clk" | ||
| * "mi2s-bit-clk" | ||
| - interrupts : Must contain an entry for each entry in | ||
| interrupt-names. | ||
| - interrupt-names : A list which must include the following entries: | ||
| * "lpass-irq-lpaif" | ||
| - pinctrl-N : One property must exist for each entry in | ||
| pinctrl-names. See ../pinctrl/pinctrl-bindings.txt | ||
| for details of the property values. | ||
| - pinctrl-names : Must contain a "default" entry. | ||
| - reg : Must contain an address for each entry in reg-names. | ||
| - reg-names : A list which must include the following entries: | ||
| * "lpass-lpaif" | ||
|
|
||
| Optional properties: | ||
|
|
||
| - qcom,adsp : Phandle for the audio DSP node | ||
|
|
||
| Example: | ||
|
|
||
| lpass@28100000 { | ||
| compatible = "qcom,lpass-cpu"; | ||
| clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>; | ||
| clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; | ||
| interrupts = <0 85 1>; | ||
| interrupt-names = "lpass-irq-lpaif"; | ||
| pinctrl-names = "default", "idle"; | ||
| pinctrl-0 = <&mi2s_default>; | ||
| pinctrl-1 = <&mi2s_idle>; | ||
| reg = <0x28100000 0x10000>; | ||
| reg-names = "lpass-lpaif"; | ||
| qcom,adsp = <&adsp>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| Renesas Sampling Rate Convert Sound Card: | ||
|
|
||
| Renesas Sampling Rate Convert Sound Card specifies audio DAI connections of SoC <-> codec. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "renesas,rsrc-card,<board>" | ||
| Examples with soctypes are: | ||
| - "renesas,rsrc-card,lager" | ||
| - "renesas,rsrc-card,koelsch" | ||
| Optional properties: | ||
|
|
||
| - card_name : User specified audio sound card name, one string | ||
| property. | ||
| - cpu : CPU sub-node | ||
| - codec : CODEC sub-node | ||
|
|
||
| Optional subnode properties: | ||
|
|
||
| - format : CPU/CODEC common audio format. | ||
| "i2s", "right_j", "left_j" , "dsp_a" | ||
| "dsp_b", "ac97", "pdm", "msb", "lsb" | ||
| - frame-master : Indicates dai-link frame master. | ||
| phandle to a cpu or codec subnode. | ||
| - bitclock-master : Indicates dai-link bit clock master. | ||
| phandle to a cpu or codec subnode. | ||
| - bitclock-inversion : bool property. Add this if the | ||
| dai-link uses bit clock inversion. | ||
| - frame-inversion : bool property. Add this if the | ||
| dai-link uses frame clock inversion. | ||
| - convert-rate : platform specified sampling rate convert | ||
|
|
||
| Required CPU/CODEC subnodes properties: | ||
|
|
||
| - sound-dai : phandle and port of CPU/CODEC | ||
|
|
||
| Optional CPU/CODEC subnodes properties: | ||
|
|
||
| - clocks / system-clock-frequency : specify subnode's clock if needed. | ||
| it can be specified via "clocks" if system has | ||
| clock node (= common clock), or "system-clock-frequency" | ||
| (if system doens't support common clock) | ||
| If a clock is specified, it is | ||
| enabled with clk_prepare_enable() | ||
| in dai startup() and disabled with | ||
| clk_disable_unprepare() in dai | ||
| shutdown(). | ||
|
|
||
| Example | ||
|
|
||
| sound { | ||
| compatible = "renesas,rsrc-card,lager"; | ||
|
|
||
| card-name = "rsnd-ak4643"; | ||
| format = "left_j"; | ||
| bitclock-master = <&sndcodec>; | ||
| frame-master = <&sndcodec>; | ||
|
|
||
| sndcpu: cpu { | ||
| sound-dai = <&rcar_sound>; | ||
| }; | ||
|
|
||
| sndcodec: codec { | ||
| sound-dai = <&ak4643>; | ||
| system-clock-frequency = <11289600>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| * Sound complex for Storm boards | ||
|
|
||
| Models a soundcard for Storm boards with the Qualcomm Technologies IPQ806x SOC | ||
| connected to a MAX98357A DAC via I2S. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "google,storm-audio" | ||
| - cpu : Phandle of the CPU DAI | ||
| - codec : Phandle of the codec DAI | ||
|
|
||
| Optional properties: | ||
|
|
||
| - qcom,model : The user-visible name of this sound card. | ||
|
|
||
| Example: | ||
|
|
||
| sound { | ||
| compatible = "google,storm-audio"; | ||
| qcom,model = "ipq806x-storm"; | ||
| cpu = <&lpass_cpu>; | ||
| codec = <&max98357a>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.