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

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

ALSA: virtuoso: add S/PDIF input support for all Xonars 



All Xonar cards support S/PDIF input, but the cards without optical or
coaxial plugs have only undocumented pin connectors.  Support for the
ST/STX was already added in a previous patch; this adds support for the
D1/DX (JP2), DG (J5), DS (J5), and HDAV Slim (J12).

Many thanks to Zoltan Miklos for testing the DS and DX.

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

sound/pci/oxygen/xonar_cs43xx.c

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static const struct oxygen_model model_xonar_d1 = { 
	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 CAPTURE_0_FROM_I2S_2 |

			 CAPTURE_1_FROM_SPDIF |

			 AC97_FMIC_SWITCH,

	.dac_channels_pcm = 8,

	.dac_channels_mixer = 8,

sound/pci/oxygen/xonar_dg.c

+2 −1
Original line number Diff line number Diff line
@@ -597,7 +597,8 @@ struct oxygen_model model_xonar_dg = { 
	.model_data_size = sizeof(struct dg),

	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 CAPTURE_0_FROM_I2S_2,

			 CAPTURE_0_FROM_I2S_2 |

			 CAPTURE_1_FROM_SPDIF,

	.dac_channels_pcm = 6,

	.dac_channels_mixer = 0,

	.function_flags = OXYGEN_FUNCTION_SPI,

sound/pci/oxygen/xonar_wm87x6.c

+4 −2
Original line number Diff line number Diff line
@@ -1274,7 +1274,8 @@ static const struct oxygen_model model_xonar_ds = { 
	.model_data_size = sizeof(struct xonar_wm87x6),

	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 CAPTURE_0_FROM_I2S_1,

			 CAPTURE_0_FROM_I2S_1 |

			 CAPTURE_1_FROM_SPDIF,

	.dac_channels_pcm = 8,

	.dac_channels_mixer = 8,

	.dac_volume_min = 255 - 2*60,
@@ -1306,7 +1307,8 @@ static const struct oxygen_model model_xonar_hdav_slim = { 
	.model_data_size = sizeof(struct xonar_wm87x6),

	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 CAPTURE_0_FROM_I2S_1,

			 CAPTURE_0_FROM_I2S_1 |

			 CAPTURE_1_FROM_SPDIF,

	.dac_channels_pcm = 8,

	.dac_channels_mixer = 2,

	.dac_volume_min = 255 - 2*60,