Commit 67c2fe2f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/axi' of... 

Merge branch 'topic/axi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dma
parents 2b67f8ba bbe58030

Documentation/devicetree/bindings/sound/adi,axi-i2s.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
ADI AXI-I2S controller



Required properties:

 - compatible : Must be "adi,axi-i2s-1.00.a"

 - reg : Must contain I2S core's registers location and length

 - clocks : Pairs of phandle and specifier referencing the controller's clocks.

   The controller expects two clocks, the clock used for the AXI interface and

   the clock used as the sampling rate reference clock sample.

 - 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.

 - 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

please check:

	* resource-names.txt

	* clock/clock-bindings.txt

	* dma/dma.txt



Example:



	i2s: i2s@0x77600000 {

		compatible = "adi,axi-i2s-1.00.a";

		reg = <0x77600000 0x1000>;

		clocks = <&clk 15>, <&audio_clock>;

		clock-names = "axi", "ref";

		dmas = <&ps7_dma 0>, <&ps7_dma 1>;

		dma-names = "tx", "rx";

	};

Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
ADI AXI-SPDIF controller



Required properties:

 - compatible : Must be "adi,axi-spdif-1.00.a"

 - reg : Must contain SPDIF core's registers location and length

 - clocks : Pairs of phandle and specifier referencing the controller's clocks.

   The controller expects two clocks, the clock used for the AXI interface and

   the clock used as the sampling rate reference clock sample.

 - 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 channel that is used by

   the core. The core expects one dma channel for transmit.

 - dma-names : Must be "tx"



For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties

please check:

	* resource-names.txt

	* clock/clock-bindings.txt

	* dma/dma.txt



Example:



	spdif: spdif@0x77400000 {

		compatible = "adi,axi-spdif-tx-1.00.a";

		reg = <0x77600000 0x1000>;

		clocks = <&clk 15>, <&audio_clock>;

		clock-names = "axi", "ref";

		dmas = <&ps7_dma 0>;

		dma-names = "tx";

	};

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config SND_SOC_GENERIC_DMAENGINE_PCM 
	select SND_DMAENGINE_PCM



# All the supported SoCs

source "sound/soc/adi/Kconfig"

source "sound/soc/atmel/Kconfig"

source "sound/soc/au1x/Kconfig"

source "sound/soc/blackfin/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ endif 
obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o

obj-$(CONFIG_SND_SOC)	+= codecs/

obj-$(CONFIG_SND_SOC)	+= generic/

obj-$(CONFIG_SND_SOC)	+= adi/

obj-$(CONFIG_SND_SOC)	+= atmel/

obj-$(CONFIG_SND_SOC)	+= au1x/

obj-$(CONFIG_SND_SOC)	+= blackfin/

sound/soc/adi/Kconfig

0 → 100644
+21 −0
Original line number Diff line number Diff line 
config SND_SOC_ADI

	tristate "Audio support for Analog Devices reference designs"

	depends on MICROBLAZE || ARCH_ZYNQ || COMPILE_TEST

	help

	  Audio support for various reference designs by Analog Devices.



config SND_SOC_ADI_AXI_I2S

	tristate "AXI-I2S support"

	depends on SND_SOC_ADI

	select SND_SOC_GENERIC_DMAENGINE_PCM

	select REGMAP_MMIO

	help

	  ASoC driver for the Analog Devices AXI-I2S softcore peripheral.



config SND_SOC_ADI_AXI_SPDIF

	tristate "AXI-SPDIF support"

	depends on SND_SOC_ADI

	select SND_SOC_GENERIC_DMAENGINE_PCM

	select REGMAP_MMIO

	help

	  ASoC driver for the Analog Devices AXI-SPDIF softcore peripheral.