Commit 840f0e43 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next

parents 049d4140 b4345006
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
@@ -13,6 +13,25 @@ Required properties:
  - #gpio-cells : Should be two. The first cell is the pin number and the
    second cell is used to specify optional parameters (currently unused).

Pins on the device (for linking into audio routes):

  * SPK_OUTP
  * SPK_OUTN
  * HP_OUT_L
  * HP_OUT_R
  * AUX_OUT_P
  * AUX_OUT_N
  * LINE_IN_L
  * LINE_IN_R
  * PHONE_P
  * PHONE_N
  * MIC1_P
  * MIC1_N
  * MIC2_P
  * MIC2_N
  * MICBIAS1
  * DMICDAT

Example:

alc5632: alc5632@1e {
+2 −22
Original line number Diff line number Diff line
@@ -11,28 +11,8 @@ Required properties:
- nvidia,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 ALC5632's pins:

  ALC5632 pins:

  * SPK_OUTP
  * SPK_OUTN
  * HP_OUT_L
  * HP_OUT_R
  * AUX_OUT_P
  * AUX_OUT_N
  * LINE_IN_L
  * LINE_IN_R
  * PHONE_P
  * PHONE_N
  * MIC1_P
  * MIC1_N
  * MIC2_P
  * MIC2_N
  * MICBIAS1
  * DMICDAT

  Board connectors:
  sinks are the ALC5632's pins as documented in the binding for the device
  and:

  * Headset Stereophone
  * Int Spk
+3 −23
Original line number Diff line number Diff line
@@ -11,32 +11,12 @@ Required properties:
- nvidia,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 RT5640's pins, and the jacks on the board:

  RT5640 pins:

  * DMIC1
  * DMIC2
  * MICBIAS1
  * IN1P
  * IN1R
  * IN2P
  * IN2R
  * HPOL
  * HPOR
  * LOUTL
  * LOUTR
  * MONOP
  * MONON
  * SPOLP
  * SPOLN
  * SPORP
  * SPORN

  Board connectors:
  sinks are the RT5640's pins (as documented in its binding), and the jacks
  on the board:

  * Headphones
  * Speakers
  * Mic Jack

- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
  connected to the CODEC.
+2 −22
Original line number Diff line number Diff line
@@ -11,28 +11,8 @@ Required properties:
- nvidia,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 WM8903's pins, and the jacks on the board:

  WM8903 pins:

  * IN1L
  * IN1R
  * IN2L
  * IN2R
  * IN3L
  * IN3R
  * DMICDAT
  * HPOUTL
  * HPOUTR
  * LINEOUTL
  * LINEOUTR
  * LOP
  * LON
  * ROP
  * RON
  * MICBIAS

  Board connectors:
  sinks are the WM8903's pins (documented in the WM8903 binding document),
  and the jacks on the board:

  * Headphone Jack
  * Int Spk
+20 −0
Original line number Diff line number Diff line
@@ -18,6 +18,26 @@ Optional properties:

- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.

Pins on the device (for linking into audio routes):

  * DMIC1
  * DMIC2
  * MICBIAS1
  * IN1P
  * IN1R
  * IN2P
  * IN2R
  * HPOL
  * HPOR
  * LOUTL
  * LOUTR
  * MONOP
  * MONON
  * SPOLP
  * SPOLN
  * SPORP
  * SPORN

Example:

rt5640 {
Loading