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

Commit 3510a694 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/sigmadsp', 'asoc/topic/sirf',... 

Merge remote-tracking branches 'asoc/topic/sigmadsp', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/tas2552' and 'asoc/topic/tas5086' into asoc-next
parents c1bd940a 2488708f c8448051 294e8a75 c62f9d8f c46af312

Documentation/devicetree/bindings/sound/sirf-usp.txt

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
* SiRF SoC USP module



Required properties:

- compatible: "sirf,prima2-usp-pcm"

- reg: Base address and size entries:

- dmas: List of DMA controller phandle and DMA request line ordered pairs.

- dma-names: Identifier string for each DMA request line in the dmas property.

  These strings correspond 1:1 with the ordered pairs in dmas.



  One of the DMA channels will be responsible for transmission (should be

  named "tx") and one for reception (should be named "rx").



- clocks: USP controller clock source

- pinctrl-names: Must contain a "default" entry.

- pinctrl-NNN: One property must exist for each entry in pinctrl-names.



Example:

usp0: usp@b0080000 {

	compatible = "sirf,prima2-usp-pcm";

	reg = <0xb0080000 0x10000>;

	clocks = <&clks 28>;

	dmas = <&dmac1 1>, <&dmac1 2>;

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

	pinctrl-names = "default";

	pinctrl-0 = <&usp0_only_utfs_pins_a>;

};

Documentation/devicetree/bindings/sound/tas2552.txt

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
Texas Instruments - tas2552 Codec module



The tas2552 serial control bus communicates through I2C protocols



Required properties:

	- compatible - One of:

		"ti,tas2552" - TAS2552

	- reg -  I2C slave address

	- supply-*: Required supply regulators are:

		"vbat"		battery voltage

		"iovdd"		I/O Voltage

		"avdd"		Analog DAC Voltage



Optional properties:

	- enable-gpio - gpio pin to enable/disable the device



Example:



tas2552: tas2552@41 {

	compatible = "ti,tas2552";

	reg = <0x41>;

	enable-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;

};



For more product information please see the link below:

http://www.ti.com/product/TAS2552

Documentation/devicetree/bindings/sound/ti,tas5086.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,9 @@ Optional properties: 




			Most systems should not set any of these properties.

			Most systems should not set any of these properties.





 - avdd-supply:         Power supply for AVDD, providing 3.3V

 - dvdd-supply:         Power supply for DVDD, providing 3.3V



Examples:

Examples:





	i2c_bus {

	i2c_bus {
@@ -39,5 +42,7 @@ Examples: 
			reg = <0x1b>;

			reg = <0x1b>;

			reset-gpio = <&gpio 23 0>;

			reset-gpio = <&gpio 23 0>;

			ti,charge-period = <156000>;

			ti,charge-period = <156000>;

			avdd-supply = <&vdd_3v3_reg>;

			dvdd-supply = <&vdd_3v3_reg>;

		};

		};

	};
 
	};

include/sound/tas2552-plat.h

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/*

 * TAS2552 driver platform header

 *

 * Copyright (C) 2014 Texas Instruments Inc.

 *

 * Author: Dan Murphy <dmurphy@ti.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */



#ifndef TAS2552_PLAT_H

#define TAS2552_PLAT_H



struct tas2552_platform_data {

	int enable_gpio;

};



#endif

sound/soc/codecs/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_STA350 if I2C

	select SND_SOC_STA350 if I2C

	select SND_SOC_STA529 if I2C

	select SND_SOC_STA529 if I2C

	select SND_SOC_STAC9766 if SND_SOC_AC97_BUS

	select SND_SOC_STAC9766 if SND_SOC_AC97_BUS

	select SND_SOC_TAS2552 if I2C

	select SND_SOC_TAS5086 if I2C

	select SND_SOC_TAS5086 if I2C

	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -539,6 +540,10 @@ config SND_SOC_STA529 
config SND_SOC_STAC9766

config SND_SOC_STAC9766

	tristate

	tristate





config SND_SOC_TAS2552

	tristate "Texas Instruments TAS2552 Mono Audio amplifier"

	depends on I2C



config SND_SOC_TAS5086

config SND_SOC_TAS5086

	tristate "Texas Instruments TAS5086 speaker amplifier"

	tristate "Texas Instruments TAS5086 speaker amplifier"

	depends on I2C

	depends on I2C