diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
| commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
| tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt | |
| parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
| parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) | |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt index 33826f2459fa..ca9101777c44 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt +++ b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt @@ -10,7 +10,7 @@ Required properties: - clock-names: must contain "kclk" - interrupts: cpu DAI interrupt line - dmas: DMA specifiers for audio data DMA and iec control flow DMA - See STM32 DMA bindings, Documentation/devicetree/bindings/dma/stm32-dma.txt + See STM32 DMA bindings, Documentation/devicetree/bindings/dma/st,stm32-dma.yaml - dma-names: two dmas have to be defined, "rx" and "rx-ctrl" Optional properties: |