Commit de664936 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: oxygen: update hardware comments 



Reformat and update the comments that describe the hardware connections
on the various models.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e2943efa

sound/pci/oxygen/oxygen.c

+15 −9
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
 *

 * CM9780:

 *

 *   LINE_OUT -> input of ADC

 *

 *   AUX_IN <- aux

 *   CD_IN  <- CD

 *   MIC_IN <- mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to ADC input

 */

sound/pci/oxygen/xonar_cs43xx.c

+16 −17
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
 *

 * CMI8788:

 *

 * I²C <-> CS4398 (front)

 *     <-> CS4362A (surround, center/LFE, back)

 *   I²C <-> CS4398 (addr 1001111) (front)

 *       <-> CS4362A (addr 0011000) (surround, center/LFE, back)

 *

 *   GPI 0 <- external power present (DX only)

 *
@@ -31,18 +31,17 @@ 
 *   GPIO 1 -> route output to front panel

 *   GPIO 2 -> M0 of CS5361

 *   GPIO 3 -> M1 of CS5361

 *   GPIO 6 -> ?

 *   GPIO 7 -> ?

 *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)

 *

 * CS4398:

 *

 * AD0 <- 1

 * AD1 <- 1

 *

 * CS4362A:

 * CM9780:

 *

 * AD0 <- 0

 *   LINE_OUT -> input of ADC

 *

 * CM9780:

 *   AUX_IN  <- aux

 *   MIC_IN  <- mic

 *   FMIC_IN <- front mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5361 input

 */

sound/pci/oxygen/xonar_pcm179x.c

+91 −57
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ 
 *

 * CM9780:

 *

 *   LINE_OUT -> input of ADC

 *

 *   AUX_IN   <- aux

 *   VIDEO_IN <- CD

 *   FMIC_IN  <- mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input

 */
@@ -44,22 +50,29 @@ 
 *

 * CMI8788:

 *

 * I²C <-> PCM1796 (front)

 *   I²C <-> PCM1796 (addr 1001100) (front)

 *

 *   GPI 0 <- external power present

 *

 * GPIO 0 -> enable output to speakers

 *   GPIO 0 -> enable HDMI (0) or speaker (1) output

 *   GPIO 2 -> M0 of CS5381

 *   GPIO 3 -> M1 of CS5381

 *   GPIO 4 <- daughterboard detection

 *   GPIO 5 <- daughterboard detection

 *   GPIO 6 -> ?

 *   GPIO 7 -> ?

 *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)

 *

 * TXD -> HDMI controller

 * RXD <- HDMI controller

 *

 * PCM1796 front: AD1,0 <- 0,0

 *   UART <-> HDMI controller

 *

 * CM9780:

 *

 *   LINE_OUT -> input of ADC

 *

 *   AUX_IN <- aux

 *   CD_IN  <- CD

 *   MIC_IN <- mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input

 *

 * no daughterboard
@@ -73,13 +86,9 @@ 
 *   GPIO 4 <- 0

 *   GPIO 5 <- 0

 *

 * I²C <-> PCM1796 (surround)

 *     <-> PCM1796 (center/LFE)

 *     <-> PCM1796 (back)

 *

 * PCM1796 surround:   AD1,0 <- 0,1

 * PCM1796 center/LFE: AD1,0 <- 1,0

 * PCM1796 back:       AD1,0 <- 1,1

 *   I²C <-> PCM1796 (addr 1001101) (surround)

 *       <-> PCM1796 (addr 1001110) (center/LFE)

 *       <-> PCM1796 (addr 1001111) (back)

 *

 * unknown daughterboard

 * ---------------------
@@ -87,9 +96,7 @@ 
 *   GPIO 4 <- 0

 *   GPIO 5 <- 1

 *

 * I²C <-> CS4362A (surround, center/LFE, back)

 *

 * CS4362A: AD0 <- 0

 *   I²C <-> CS4362A (addr 0011000) (surround, center/LFE, back)

 */



/*
@@ -98,8 +105,8 @@ 
 *

 * CMI8788:

 *

 * I²C <-> PCM1792A

 *     <-> CS2000 (ST only)

 *   I²C <-> PCM1792A (addr 1001100)

 *       <-> CS2000 (addr 1001110) (ST only)

 *

 *   ADC1 MCLK -> REF_CLK of CS2000 (ST only)

 *
@@ -109,19 +116,22 @@ 
 *   GPIO 1 -> route HP to front panel (0) or rear jack (1)

 *   GPIO 2 -> M0 of CS5381

 *   GPIO 3 -> M1 of CS5381

 *   GPIO 4 <- daughterboard detection

 *   GPIO 5 <- daughterboard detection

 *   GPIO 6 -> ?

 *   GPIO 7 -> route output to speaker jacks (0) or HP (1)

 *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)

 *

 * PCM1792A:

 *

 * AD1,0 <- 0,0

 *   SCK <- CLK_OUT of CS2000 (ST only)

 *

 * CS2000:

 * CM9780:

 *

 * AD0 <- 0

 *   LINE_OUT -> input of ADC

 *

 * CM9780:

 *   AUX_IN <- aux

 *   MIC_IN <- mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input

 *
@@ -133,15 +143,39 @@ 
 */



/*

 * Xonar HDAV1.3 Slim

 * ------------------

 * Xonar Xense

 * -----------

 *

 * CMI8788:

 *

 * GPIO 1 -> enable output

 *   I²C <-> PCM1796 (addr 1001100) (front)

 *       <-> CS4362A (addr 0011000) (surround, center/LFE, back)

 *       <-> CS2000 (addr 1001110)

 *

 *   ADC1 MCLK -> REF_CLK of CS2000

 *

 * TXD -> HDMI controller

 * RXD <- HDMI controller

 *   GPI 0 <- external power present

 *

 *   GPIO 0 -> enable output

 *   GPIO 1 -> route HP to front panel (0) or rear jack (1)

 *   GPIO 2 -> M0 of CS5381

 *   GPIO 3 -> M1 of CS5381

 *   GPIO 4 -> enable output

 *   GPIO 5 -> enable output

 *   GPIO 6 -> ?

 *   GPIO 7 -> route output to HP (0) or speaker (1)

 *   GPIO 8 -> route input jack to mic-in (0) or line-in (1)

 *

 * CM9780:

 *

 *   LINE_OUT -> input of ADC

 *

 *   AUX_IN   <- aux

 *   VIDEO_IN <- ?

 *   FMIC_IN  <- mic

 *

 *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input

 *   GPO 1 -> route mic-in from input jack (0) or front panel header (1)

 */



#include <linux/pci.h>

sound/pci/oxygen/xonar_wm87x6.c

+32 −11
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
 *   GPIO 7 -> enable output to front L/R speaker channels

 *   GPIO 8 -> enable output to other speaker channels and front panel headphone

 *

 * WM8766:

 * WM8776:

 *

 *   input 1 <- line

 *   input 2 <- mic
@@ -38,6 +38,27 @@ 
 *   input 4 <- aux

 */



/*

 * Xonar HDAV1.3 Slim

 * ------------------

 *

 * CMI8788:

 *

 *   I²C <-> WM8776 (addr 0011010)

 *

 *   GPIO 0  -> disable HDMI output

 *   GPIO 1  -> enable HP output

 *   GPIO 6  -> firmware EEPROM I²C clock

 *   GPIO 7 <-> firmware EEPROM I²C data

 *

 *   UART <-> HDMI controller

 *

 * WM8776:

 *

 *   input 1 <- mic

 *   input 2 <- aux

 */



#include <linux/pci.h>

#include <linux/delay.h>

#include <sound/control.h>