Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 378d590c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.2' into asoc-next

parents 7f5a466f 1587a061
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
ADI AXI-I2S controller

The core can be generated with transmit (playback), only receive
(capture) or both directions enabled.

Required properties:
 - compatible : Must be "adi,axi-i2s-1.00.a"
 - reg : Must contain I2S core's registers location and length
@@ -9,8 +12,8 @@ Required properties:
 - clock-names : "axi" for the clock to the AXI interface, "ref" for the sample
   rate reference clock.
 - dmas: Pairs of phandle and specifier for the DMA channels that are used by
   the core. The core expects two dma channels, one for transmit and one for
   receive.
   the core. The core expects two dma channels if both transmit and receive are
   enabled, one channel otherwise.
 - dma-names : "tx" for the transmit channel, "rx" for the receive channel.

For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties
+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@

Required properties:
- compatible: 'amlogic,axg-toddr' or
	      'amlogic,axg-frddr'
	      'amlogic,axg-toddr' or
	      'amlogic,g12a-frddr' or
	      'amlogic,g12a-toddr'
- reg: physical base address of the controller and length of memory
       mapped region.
- interrupts: interrupt specifier for the fifo.
+2 −1
Original line number Diff line number Diff line
* Amlogic Audio PDM input

Required properties:
- compatible: 'amlogic,axg-pdm'
- compatible: 'amlogic,axg-pdm' or
	      'amlogic,g12a-pdm'
- reg: physical base address of the controller and length of memory
       mapped region.
- clocks: list of clock phandle, one for each entry clock-names.
+2 −1
Original line number Diff line number Diff line
* Amlogic Audio SPDIF Input

Required properties:
- compatible: 'amlogic,axg-spdifin'
- compatible: 'amlogic,axg-spdifin' or
	      'amlogic,g12a-spdifin'
- interrupts: interrupt specifier for the spdif input.
- clocks: list of clock phandle, one for each entry clock-names.
- clock-names: should contain the following:
+2 −1
Original line number Diff line number Diff line
* Amlogic Audio SPDIF Output

Required properties:
- compatible: 'amlogic,axg-spdifout'
- compatible: 'amlogic,axg-spdifout' or
	      'amlogic,g12a-spdifout'
- clocks: list of clock phandle, one for each entry clock-names.
- clock-names: should contain the following:
  * "pclk" : peripheral clock.
Loading