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

Commit 092d4050 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus

parents 5e01dc7b 12850b8d
Loading
Loading
Loading
Loading
+22 −0
Original line number Original line Diff line number Diff line
CS42L73 audio CODEC

Required properties:

  - compatible : "cirrus,cs42l73"

  - reg : the I2C address of the device for I2C

Optional properties:

  - reset_gpio : a GPIO spec for the reset pin.
  - chgfreq    : Charge Pump Frequency values 0x00-0x0F


Example:

codec: cs42l73@4a {
	compatible = "cirrus,cs42l73";
	reg = <0x4a>;
	reset_gpio = <&gpio 10 0>;
	chgfreq = <0x05>;
};
 No newline at end of file
+42 −0
Original line number Original line Diff line number Diff line
* Texas Instruments SoC audio setups with TLV320AIC3X Codec

Required properties:
- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx
- ti,model : The user-visible name of this sound complex.
- ti,audio-codec : The phandle of the TLV320AIC3x audio codec
- ti,mcasp-controller : The phandle of the McASP controller
- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec
- ti,audio-routing : A list of the connections between audio components.
  Each entry is a pair of strings, the first being the connection's sink,
  the second being the connection's source. Valid names for sources and
  sinks are the codec's pins, and the jacks on the board:

  Board connectors:

  * Headphone Jack
  * Line Out
  * Mic Jack
  * Line In


Example:

sound {
	compatible = "ti,da830-evm-audio";
	ti,model = "DA830 EVM";
	ti,audio-codec = <&tlv320aic3x>;
	ti,mcasp-controller = <&mcasp1>;
	ti,codec-clock-rate = <12000000>;
	ti,audio-routing =
		"Headphone Jack",       "HPLOUT",
		"Headphone Jack",       "HPROUT",
		"Line Out",             "LLOUT",
		"Line Out",             "RLOUT",
		"MIC3L",                "Mic Bias 2V",
		"MIC3R",                "Mic Bias 2V",
		"Mic Bias 2V",          "Mic Jack",
		"LINE1L",               "Line In",
		"LINE2L",               "Line In",
		"LINE1R",               "Line In",
		"LINE2R",               "Line In";
};
+27 −14
Original line number Original line Diff line number Diff line
@@ -4,17 +4,25 @@ Required properties:
- compatible :
- compatible :
	"ti,dm646x-mcasp-audio"	: for DM646x platforms
	"ti,dm646x-mcasp-audio"	: for DM646x platforms
	"ti,da830-mcasp-audio"	: for both DA830 & DA850 platforms
	"ti,da830-mcasp-audio"	: for both DA830 & DA850 platforms
	"ti,omap2-mcasp-audio"	: for OMAP2 platforms (TI81xx, AM33xx)
	"ti,am33xx-mcasp-audio"	: for AM33xx platforms (AM33xx, TI81xx)

- reg : Should contain McASP registers offset and length
- interrupts : Interrupt number for McASP
- op-mode : I2S/DIT ops mode.
- tdm-slots : Slots for TDM operation.
- num-serializer : Serializers used by McASP.
- serial-dir : A list of serializer pin mode. The list number should be equal
		to "num-serializer" parameter. Each entry is a number indication
		serializer pin direction. (0 - INACTIVE, 1 - TX, 2 - RX)


- reg : Should contain reg specifiers for the entries in the reg-names property.
- reg-names : Should contain:
         * "mpu" for the main registers (required). For compatibility with
           existing software, it is recommended this is the first entry.
         * "dat" for separate data port register access (optional).
- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF,
  	    IEC60958-1, and AES-3 formats.
- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted
  	      or received over one serializer.
- serial-dir : A list of serializer configuration. Each entry is a number
               indication for serializer pin direction.
               (0 - INACTIVE, 1 - TX, 2 - RX)
- dmas: two element list of DMA controller phandles 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. The dma
	     identifiers must be "rx" and "tx".


Optional properties:
Optional properties:


@@ -23,18 +31,23 @@ Optional properties:
- rx-num-evt : FIFO levels.
- rx-num-evt : FIFO levels.
- sram-size-playback : size of sram to be allocated during playback
- sram-size-playback : size of sram to be allocated during playback
- sram-size-capture  : size of sram to be allocated during capture
- sram-size-capture  : size of sram to be allocated during capture
- interrupts : Interrupt numbers for McASP, currently not used by the driver
- interrupt-names : Known interrupt names are "tx" and "rx"
- pinctrl-0: Should specify pin control group used for this controller.
- pinctrl-names: Should contain only one value - "default", for more details
  		 please refer to pinctrl-bindings.txt
  


Example:
Example:


mcasp0: mcasp0@1d00000 {
mcasp0: mcasp0@1d00000 {
	compatible = "ti,da830-mcasp-audio";
	compatible = "ti,da830-mcasp-audio";
	#address-cells = <1>;
	#size-cells = <0>;
	reg = <0x100000 0x3000>;
	reg = <0x100000 0x3000>;
	interrupts = <82 83>;
	reg-names "mpu";
	interrupts = <82>, <83>;
	interrupts-names = "tx", "rx";
	op-mode = <0>;		/* MCASP_IIS_MODE */
	op-mode = <0>;		/* MCASP_IIS_MODE */
	tdm-slots = <2>;
	tdm-slots = <2>;
	num-serializer = <16>;
	serial-dir = <
	serial-dir = <
			0 0 0 0	/* 0: INACTIVE, 1: TX, 2: RX */
			0 0 0 0	/* 0: INACTIVE, 1: TX, 2: RX */
			0 0 0 0
			0 0 0 0
+26 −0
Original line number Original line Diff line number Diff line
@@ -24,10 +24,36 @@ Optional properties:
	3 - MICBIAS output is connected to AVDD,
	3 - MICBIAS output is connected to AVDD,
	If this node is not mentioned or if the value is incorrect, then MicBias
	If this node is not mentioned or if the value is incorrect, then MicBias
	is powered down.
	is powered down.
- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
  device as covered in Documentation/devicetree/bindings/regulator/regulator.txt

CODEC output pins:
  * LLOUT
  * RLOUT
  * MONO_LOUT
  * HPLOUT
  * HPROUT
  * HPLCOM
  * HPRCOM

CODEC input pins:
  * MIC3L
  * MIC3R
  * LINE1L
  * LINE2L
  * LINE1R
  * LINE2R

The pins can be used in referring sound node's audio-routing property.


Example:
Example:


tlv320aic3x: tlv320aic3x@1b {
tlv320aic3x: tlv320aic3x@1b {
	compatible = "ti,tlv320aic3x";
	compatible = "ti,tlv320aic3x";
	reg = <0x1b>;
	reg = <0x1b>;

	AVDD-supply = <&regulator>;
	IOVDD-supply = <&regulator>;
	DRVDD-supply = <&regulator>;
	DVDD-supply = <&regulator>;
};
};
+27 −0
Original line number Original line Diff line number Diff line
Texas Instruments - tpa6130a2 Codec module

The tpa6130a2 serial control bus communicates through I2C protocols

Required properties:

- compatible - "string" - One of:
    "ti,tpa6130a2" - TPA6130A2
    "ti,tpa6140a2" - TPA6140A2


- reg - <int> -  I2C slave address

- Vdd-supply - <phandle> - power supply regulator

Optional properties:

- power-gpio - gpio pin to power the device

Example:

tpa6130a2: tpa6130a2@60 {
	compatible = "ti,tpa6130a2";
	reg = <0x60>;
	Vdd-supply = <&vmmc2>;
	power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
};
Loading