ASoC: ti: Add support for audio on J721e EVM
Subsystems (4)
v2 cover ASoC: ti: Add support for audio on J721e EVM
Hi,
Changes since v1:
- Fixed DT binding documentation errors
- Rebased on ASoC head and updated the driver to compile and work
This series adds support for the analog audio setup on the j721e EVM. The audio setup of the EVM is:
Common Processor Board (CPB): McASP10 <-> pcm3168a Infotainment Expansion Board (IVI): McASP0 <-> 2x pcm3168a
Both CPB and IVI wired in parallel serializer setup.
The first patch adds the stream_name for McASP driver as it is needed in multicodec (and would be needed in DPCM) setup for proper DAPM handling.
The second patch adds two DT schema, one for the cpb and one for the cpb+ivi card.
Regards,
Peter
---
Peter Ujfalusi (3):
ASoC: ti: davinci-mcasp: Specify stream_name for playback/capture
bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
ASoC: ti: Add custom machine driver for j721e EVM (CPB and IVI)
.../bindings/sound/ti,j721e-cpb-audio.yaml | 93 ++ .../sound/ti,j721e-cpb-ivi-audio.yaml | 142 +++ sound/soc/ti/Kconfig | 8 + sound/soc/ti/Makefile | 2 + sound/soc/ti/davinci-mcasp.c | 3 + sound/soc/ti/j721e-evm.c | 867 ++++++++++++++++++ 6 files changed, 1115 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml create mode 100644 sound/soc/ti/j721e-evm.c
Signature · 4 lines
Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v2 1/3 ASoC: ti: davinci-mcasp: Specify stream_name for playback/capture
In order to dai stream widgets to be created the stream_name must be set.
--- sound/soc/ti/davinci-mcasp.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/ti/davinci-mcasp.c +3 -0
@@ -1623,12 +1623,14 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { .name = "davinci-mcasp.0", .probe = davinci_mcasp_dai_probe, .playback = { + .stream_name = "IIS Playback", .channels_min = 1, .channels_max = 32 * 16, .rates = DAVINCI_MCASP_RATES, .formats = DAVINCI_MCASP_PCM_FMTS, }, .capture = { + .stream_name = "IIS Capture", .channels_min = 1, .channels_max = 32 * 16, .rates = DAVINCI_MCASP_RATES,
@@ -1642,6 +1644,7 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { .name = "davinci-mcasp.1", .probe = davinci_mcasp_dai_probe, .playback = { + .stream_name = "DIT Playback", .channels_min = 1, .channels_max = 384, .rates = DAVINCI_MCASP_RATES,
Signature · 4 lines
Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v2 2/3 bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
In reply to Peter UjfalusiThe audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board.
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e AUDIO_REFCLK0 pin.
--- .../bindings/sound/ti,j721e-cpb-audio.yaml | 93 ++++++++++++ .../sound/ti,j721e-cpb-ivi-audio.yaml | 142 ++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +93 -0
@@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments J721e Common Processor Board Audio Support + +maintainers: + - Peter Ujfalusi <[email protected]> + +description: | + The audio support on the board is using pcm3168a codec connected to McASP10 + serializers in parallel setup. + The pcm3168a SCKI clock is sourced from j721e AUDIO_REFCLK2 pin. + In order to support 48KHz and 44.1KHz family of sampling rates the parent + clock for AUDIO_REFCLK2 needs to be changed between PLL4 (for 48KHz) and + PLL15 (for 44.1KHz). The same PLLs are used for McASP10's AUXCLK clock via + different HSDIVIDER. + +properties: + compatible: + items: + - const: ti,j721e-cpb-audio + + model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + + ti,cpb-mcasp: + description: phandle to McASP10 + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,cpb-codec: + description: phandle to the pcm3168a codec used on the CPB + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + clocks: + items: + - description: PLL4 clock + - description: PLL15 clock + - description: McASP10 auxclk clock + - description: PLL4_HSDIV0 parent for McASP10 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP10 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK2 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK2 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK2 clock (for 44.1KHz) + + clock-names: + items: + - const: pll4 + - const: pll15 + - const: cpb-mcasp + - const: cpb-mcasp-48000 + - const: cpb-mcasp-44100 + - const: audio-refclk2 + - const: audio-refclk2-48000 + - const: audio-refclk2-44100 + +required: + - compatible + - model + - ti,cpb-mcasp + - ti,cpb-codec + - clocks + - clock-names + +additionalProperties: false + +examples: + - |+ + sound { + compatible = "ti,j721e-cpb-audio"; + model = "j721e-cpb"; + + status = "okay"; + + ti,cpb-mcasp = <&mcasp10>; + ti,cpb-codec = <&pcm3168a_1>; + + clocks = <&pll4>, <&pll15>, + <&k3_clks 184 1>, + <&k3_clks 184 2>, <&k3_clks 184 4>, + <&k3_clks 157 371>, + <&k3_clks 157 400>, <&k3_clks 157 401>; + clock-names = "pll4", "pll15", + "cpb-mcasp", + "cpb-mcasp-48000", "cpb-mcasp-44100", + "audio-refclk2", + "audio-refclk2-48000", "audio-refclk2-44100"; + };
Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml new file +142 -0
142 lines not on this page · raw message
Signature · 4 lines
Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Rob Herring
maintainerRe: [PATCH v2 2/3] bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
Quoted 64 lines · Peter Ujfalusi
The audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board.
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e
AUDIO_REFCLK0pin.Signed-off-by Peter Ujfalusi <[email protected]>--- .../bindings/sound/ti,j721e-cpb-audio.yaml | 93 ++++++++++++ .../sound/ti,j721e-cpb-ivi-audio.yaml | 142 ++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yamlDocumentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +39
-0@@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments J721e Common Processor Board Audio Support + +maintainers: + - Peter Ujfalusi <[email protected]> + +description: | + The audio support on the board is using pcm3168a codec connected to McASP10 + serializers in parallel setup. + The pcm3168a SCKI clock is sourced from j721e AUDIO_REFCLK2 pin. + In order to support 48KHz and 44.1KHz family of sampling rates the parent + clock for AUDIO_REFCLK2 needs to be changed between PLL4 (for 48KHz) and + PLL15 (for 44.1KHz). The same PLLs are used for McASP10's AUXCLK clock via + different HSDIVIDER. + +properties: + compatible: + items: + - const: ti,j721e-cpb-audio + + model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + + ti,cpb-mcasp: + description: phandle to McASP10 + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,cpb-codec: + description: phandle to the pcm3168a codec used on the CPB + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle +
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 49
Quoted 10 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +10
-0+ clocks: + items: + - description: PLL4 clock + - description: PLL15 clock + - description: McASP10 auxclk clock + - description: PLL4_HSDIV0 parent for McASP10 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP10 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK2 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK2 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK2 clock (for 44.1KHz)
What h/w are these connected to? You have no control interface here, so how do you have clocks?
Defining parent clocks seems wrong, too. This seems to just be a collection of clocks a driver happens to need. Really, you should be able query possible parents and select one with the right frequency multiple.
Quoted 19 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +19
-0+ + clock-names: + items: + - const: pll4 + - const: pll15 + - const: cpb-mcasp + - const: cpb-mcasp-48000 + - const: cpb-mcasp-44100 + - const: audio-refclk2 + - const: audio-refclk2-48000 + - const: audio-refclk2-44100 + +required: + - compatible + - model + - ti,cpb-mcasp + - ti,cpb-codec + - clocks + - clock-names
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 78
Quoted 10 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +10
-0+ +additionalProperties: false + +examples: + - |+ + sound { + compatible = "ti,j721e-cpb-audio"; + model = "j721e-cpb"; + + status = "okay";
Don't show status in examples.
Quoted 169 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +15
-0+ + ti,cpb-mcasp = <&mcasp10>; + ti,cpb-codec = <&pcm3168a_1>; + + clocks = <&pll4>, <&pll15>, + <&k3_clks 184 1>, + <&k3_clks 184 2>, <&k3_clks 184 4>, + <&k3_clks 157 371>, + <&k3_clks 157 400>, <&k3_clks 157 401>; + clock-names = "pll4", "pll15", + "cpb-mcasp", + "cpb-mcasp-48000", "cpb-mcasp-44100", + "audio-refclk2", + "audio-refclk2-48000", "audio-refclk2-44100"; + };Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml new file +142
-0@@ -0,0 +1,142 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-ivi-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments J721e Common Processor Board Audio Support + +maintainers: + - Peter Ujfalusi <[email protected]> + +description: | + The Infotainment board plugs into the Common Processor Board, the support of the + extension board is extending the CPB audio support, decribed in: + sound/ti,j721e-cpb-audio.txt + + The audio support on the Infotainment Expansion Board consists of McASP0 + connected to two pcm3168a codecs with dedicated set of serializers to each. + The SCKI for pcm3168a is sourced from j721e AUDIO_REFCLK0 pin. + + In order to support 48KHz and 44.1KHz family of sampling rates the parent clock + for AUDIO_REFCLK0 needs to be changed between PLL4 (for 48KHz) and PLL15 (for + 44.1KHz). The same PLLs are used for McASP0's AUXCLK clock via different + HSDIVIDER. + + Note: the same PLL4 and PLL15 is used by the audio support on the CPB! + +properties: + compatible: + items: + - const: ti,j721e-cpb-ivi-audio + + model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + + ti,cpb-mcasp: + description: phandle to McASP10 + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,cpb-codec: + description: phandle to the pcm3168a codec used on the CPB + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,ivi-mcasp: + description: phandle to McASP9 + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,ivi-codec-a: + description: phandle to the pcm3168a-A codec on the expansion board + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,ivi-codec-b: + description: phandle to the pcm3168a-B codec on the expansion board + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + clocks: + items: + - description: PLL4 clock + - description: PLL15 clock + - description: McASP10 auxclk clock + - description: PLL4_HSDIV0 parent for McASP10 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP10 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK2 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK2 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK2 clock (for 44.1KHz) + - description: McASP0 auxclk clock + - description: PLL4_HSDIV0 parent for McASP0 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP0 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK0 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK0 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK0 clock (for 44.1KHz) + + clock-names: + items: + - const: pll4 + - const: pll15 + - const: cpb-mcasp + - const: cpb-mcasp-48000 + - const: cpb-mcasp-44100 + - const: audio-refclk2 + - const: audio-refclk2-48000 + - const: audio-refclk2-44100 + - const: ivi-mcasp + - const: ivi-mcasp-48000 + - const: ivi-mcasp-44100 + - const: audio-refclk0 + - const: audio-refclk0-48000 + - const: audio-refclk0-44100 + +required: + - compatible + - model + - ti,cpb-mcasp + - ti,cpb-codec + - ti,ivi-mcasp + - ti,ivi-codec-a + - ti,ivi-codec-b + - clocks + - clock-names + +additionalProperties: false + +examples: + - |+ + sound { + compatible = "ti,j721e-cpb-ivi-audio"; + model = "j721e-cpb-ivi"; + + status = "okay"; + + ti,cpb-mcasp = <&mcasp10>; + ti,cpb-codec = <&pcm3168a_1>; + + ti,ivi-mcasp = <&mcasp0>; + ti,ivi-codec-a = <&pcm3168a_a>; + ti,ivi-codec-b = <&pcm3168a_b>; + + clocks = <&pll4>, <&pll15>, + <&k3_clks 184 1>, + <&k3_clks 184 2>, <&k3_clks 184 4>, + <&k3_clks 157 371>, + <&k3_clks 157 400>, <&k3_clks 157 401>, + <&k3_clks 174 1>, + <&k3_clks 174 2>, <&k3_clks 174 4>, + <&k3_clks 157 301>, + <&k3_clks 157 330>, <&k3_clks 157 331>; + clock-names = "pll4", "pll15", + "cpb-mcasp", + "cpb-mcasp-48000", "cpb-mcasp-44100", + "audio-refclk2", + "audio-refclk2-48000", "audio-refclk2-44100", + "ivi-mcasp", + "ivi-mcasp-48000", "ivi-mcasp-44100", + "audio-refclk0", + "audio-refclk0-48000", "audio-refclk0-44100"; + };Signature · 4 lines
Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v2 2/3] bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
Hi Rob,
Quoted 69 lines · Rob Herring
Quoted 68 lines · Peter Ujfalusi
The audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board.
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e
AUDIO_REFCLK0pin.Signed-off-by Peter Ujfalusi <[email protected]>--- .../bindings/sound/ti,j721e-cpb-audio.yaml | 93 ++++++++++++ .../sound/ti,j721e-cpb-ivi-audio.yaml | 142 ++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yamlDocumentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +43
-0@@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,j721e-cpb-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments J721e Common Processor Board Audio Support + +maintainers: + - Peter Ujfalusi <[email protected]> + +description: | + The audio support on the board is using pcm3168a codec connected to McASP10 + serializers in parallel setup. + The pcm3168a SCKI clock is sourced from j721e AUDIO_REFCLK2 pin. + In order to support 48KHz and 44.1KHz family of sampling rates the parent + clock for AUDIO_REFCLK2 needs to be changed between PLL4 (for 48KHz) and + PLL15 (for 44.1KHz). The same PLLs are used for McASP10's AUXCLK clock via + different HSDIVIDER. + +properties: + compatible: + items: + - const: ti,j721e-cpb-audio + + model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + + ti,cpb-mcasp: + description: phandle to McASP10 + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + ti,cpb-codec: + description: phandle to the pcm3168a codec used on the CPB + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + + clocks: + items: + - description: PLL4 clock + - description: PLL15 clock
Quoted 8 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 49
Quoted 6 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +6
-0+ - description: McASP10 auxclk clock + - description: PLL4_HSDIV0 parent for McASP10 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP10 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK2 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK2 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK2 clock (for 44.1KHz)What h/w are these connected to?
These clocks are internal to the SoC with the exception of AUDIO_REFCLK2 which is routed to SoC pin.
Quoted 1 line
You have no control interface here, so how do you have clocks?
I need to control these clocks, the sound card is the user of these clocks.
Quoted 4 lines
Defining parent clocks seems wrong, too. This seems to just be a collection of clocks a driver happens to need. Really, you should be able query possible parents and select one with the right frequency multiple.
The issue in hand is that I need to dynamically switch between certain parents of the cpb-mcasp (for McASP) and audio-refclk2 (for the codec) based on sampling rate of the stream.
The McASP auxclk parent can be selected from 7 source and I must use the two dedicated ones.
The REFCLK2 parent can be selected from 30 source.
It is also a limitation of the system that I can not query directly the PLL4/PLL15 frequencies, I can only get the frequency on the HSDIVs, but I can not get the divider on them.
In order to handle the constraints on clocking I need to know the source rate so the dividers can be taken into account. The codec is picky when it comes to clocking and there is a need to switch between 256/512/768xFS based SCKI in order to be able to support sampling rates.
At the moment I have fixed clocks in place for the pll4/15 with the rates they are configured so the dts can switch to a real clock which I can use in the future.
As things are it is unlikely that I will ever going to have access to them, but I wanted to avoid in the bindings:
ti,j721e-pll4-rate = <1179648000>;
ti,j721e-pll15-rate = <1083801600>;
Quoted 23 lines
Quoted 23 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +23
-0+ + clock-names: + items: + - const: pll4 + - const: pll15 + - const: cpb-mcasp + - const: cpb-mcasp-48000 + - const: cpb-mcasp-44100 + - const: audio-refclk2 + - const: audio-refclk2-48000 + - const: audio-refclk2-44100 + +required: + - compatible + - model + - ti,cpb-mcasp + - ti,cpb-codec + - clocks + - clock-names + +additionalProperties: false + +examples:
Quoted 8 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 78
Quoted 6 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +6
-0+ - |+ + sound { + compatible = "ti,j721e-cpb-audio"; + model = "j721e-cpb"; + + status = "okay";Don't show status in examples.
Oops, it is a leftower
Quoted 16 lines
Quoted 6 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +5
-0+ + ti,cpb-mcasp = <&mcasp10>; + ti,cpb-codec = <&pcm3168a_1>; + + clocks = <&pll4>, <&pll15>,Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 93
Quoted 10 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +10
-0+ <&k3_clks 184 1>, + <&k3_clks 184 2>, <&k3_clks 184 4>, + <&k3_clks 157 371>, + <&k3_clks 157 400>, <&k3_clks 157 401>; + clock-names = "pll4", "pll15", + "cpb-mcasp", + "cpb-mcasp-48000", "cpb-mcasp-44100", + "audio-refclk2", + "audio-refclk2-48000", "audio-refclk2-44100"; + };
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v2 2/3] bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
Hi Rob,
Quoted 41 lines · Peter Ujfalusi
Quoted 11 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml line 49
Quoted 10 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +10
-0+ clocks: + items: + - description: PLL4 clock + - description: PLL15 clock + - description: McASP10 auxclk clock + - description: PLL4_HSDIV0 parent for McASP10 auxclk (for 48KHz) + - description: PLL15_HSDIV0 parent for McASP10 auxclk (for 44.1KHz) + - description: AUDIO_REFCLK2 clock + - description: PLL4_HSDIV2 parent for AUDIO_REFCLK2 clock (for 48KHz) + - description: PLL15_HSDIV2 parent for AUDIO_REFCLK2 clock (for 44.1KHz)Quoted 1 line
What h/w are these connected to?
These clocks are internal to the SoC with the exception of
AUDIO_REFCLK2which is routed to SoC pin.Quoted 1 line
You have no control interface here, so how do you have clocks?
I need to control these clocks, the sound card is the user of these clocks.
Quoted 4 lines
Defining parent clocks seems wrong, too. This seems to just be a collection of clocks a driver happens to need. Really, you should be able query possible parents and select one with the right frequency multiple.
The issue in hand is that I need to dynamically switch between certain parents of the cpb-mcasp (for McASP) and audio-refclk2 (for the codec) based on sampling rate of the stream.
The McASP auxclk parent can be selected from 7 source and I must use the two dedicated ones.
The REFCLK2 parent can be selected from 30 source.It is also a limitation of the system that I can not query directly the PLL4/PLL15 frequencies, I can only get the frequency on the HSDIVs, but I can not get the divider on them.
In order to handle the constraints on clocking I need to know the source rate so the dividers can be taken into account. The codec is picky when it comes to clocking and there is a need to switch between 256/512/768xFS based SCKI in order to be able to support sampling rates.
Quoted 19 lines
At the moment I have fixed clocks in place for the pll4/15 with the rates they are configured so the dts can switch to a real clock which I can use in the future.
As things are it is unlikely that I will ever going to have access to them, but I wanted to avoid in the bindings:
ti,j721e-pll4-rate = <1179648000>;
ti,j721e-pll15-rate = <1083801600>;Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml new file +11
-0+ + clock-names: + items: + - const: pll4 + - const: pll15 + - const: cpb-mcasp + - const: cpb-mcasp-48000 + - const: cpb-mcasp-44100 + - const: audio-refclk2 + - const: audio-refclk2-48000 + - const: audio-refclk2-44100
It should be better to document the refclk2 (and refclk0 for IVI) clocks based on it's use, not source:
cpb-codec-scki (sourced from audio_refclk2) cpb-codec-scki-48000/44100
For the IVI binding it is just s/cpb/ivi in the clock-names.
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Rob Herring
maintainerRe: [PATCH v2 2/3] bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
In reply to Peter UjfalusiQuoted 10 lines · Peter Ujfalusi
The audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board.
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e
AUDIO_REFCLK0pin.
Would the audio graph card work for you on this?
Re: [PATCH v2 2/3] bindings: sound: Add documentation for TI j721e EVM (CPB and IVI)
Hi Rob,
Quoted 8 lines · Rob Herring
Quoted 7 lines · Peter Ujfalusi
The audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board.
Quoted 5 lines
Quoted 3 lines
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e
AUDIO_REFCLK0pin.Would the audio graph card work for you on this?
Unfortunately not.
The CPB and IVI while using different McASP (10 for CPB, 0 for IVI) and different clock pin is used for the SCKI of the codecs on CPB and IVI, they are actually coming from the same source from within the SoC. The inter-dependency between the two audio domains are fragile and I have spent countless hours to figure out a way to masquerade the unique setup as generic. Did not worked out, it needs a custom machine driver to be able to handle the setup.
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v2 3/3 ASoC: ti: Add custom machine driver for j721e EVM (CPB and IVI)
In reply to Peter UjfalusiThe audio support on the board is using pcm3168a codec connected to McASP10 serializers in parallel setup.
The pcm3168a SCKI clock is coming via the j721e AUDIO_REFCLK2 pin. In order to support 48KHz and 44.1KHz family of sampling rates the parent clock for AUDIO_REFCLK2 needs to be changed between PLL4 (for 48KHz) and PLL15 (for 44.1KHz). The same PLLs are used for McASP10's AUXCLK clock via different HSDIVIDER.
Generic card can not be used for the board as we need to switch between clock paths for different sampling rate families and also need to change the slot_width between 16 and 24 bit audio.
The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e AUDIO_REFCLK0 pin. It is extending the audio support on the CPB.
Due to the fact that the same PLL4/15 is used by both domains (CPB/IVI) there are cross restriction on sampling rates.
The IVI side is represented as multicodec setup.
PCMs available on a plain CPB (no IVI addon):
hw:0,0 - cpb playback (8 channels)
hw:0,1 - cpb capture (6 channels)
When the IVI addon is present, additional two PCMs will be present:
hw:0,2 - ivi multicodec playback (16 channels)
hw:0,3 - ivi multicodec capture (12 channels)
--- sound/soc/ti/Kconfig | 8 + sound/soc/ti/Makefile | 2 + sound/soc/ti/j721e-evm.c | 867 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 877 insertions(+) create mode 100644 sound/soc/ti/j721e-evm.c
sound/soc/ti/Kconfig +8 -0
@@ -219,5 +219,13 @@ config SND_SOC_DM365_VOICE_CODEC_MODULE The is an internal symbol needed to ensure that the codec and MFD driver can be built as loadable modules if necessary. +config SND_SOC_J721E_EVM + tristate "SoC Audio support for j721e EVM" + depends on ARCH_K3_J721E_SOC || COMPILE_TEST + select SND_SOC_PCM3168A_I2C + select SND_SOC_DAVINCI_MCASP + help + Say Y if you want to add support for SoC audio on j721e Common + Processor Board and Infotainment expansion board. endmenu
sound/soc/ti/Makefile +2 -0
@@ -34,6 +34,7 @@ snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-ams-delta-objs := ams-delta.o snd-soc-omap-hdmi-objs := omap-hdmi.o snd-soc-osk5912-objs := osk5912.o +snd-soc-j721e-evm-objs := j721e-evm.o obj-$(CONFIG_SND_SOC_DAVINCI_EVM) += snd-soc-davinci-evm.o obj-$(CONFIG_SND_SOC_NOKIA_N810) += snd-soc-n810.o
@@ -44,3 +45,4 @@ obj-$(CONFIG_SND_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_SOC_OMAP_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_SOC_OMAP_HDMI) += snd-soc-omap-hdmi.o obj-$(CONFIG_SND_SOC_OMAP_OSK5912) += snd-soc-osk5912.o +obj-$(CONFIG_SND_SOC_J721E_EVM) += snd-soc-j721e-evm.o
sound/soc/ti/j721e-evm.c new file +867 -0
867 lines not on this page · raw message
Signature · 4 lines
Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki