aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/hifier.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/oxygen/hifier.c')
-rw-r--r--sound/pci/oxygen/hifier.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
index 0e425d554505..6e45a58ad14b 100644
--- a/sound/pci/oxygen/hifier.c
+++ b/sound/pci/oxygen/hifier.c
@@ -68,15 +68,22 @@ static void update_ak4396_volume(struct oxygen *chip)
68 ak4396_write(chip, AK4396_RCH_ATT, chip->dac_volume[1]); 68 ak4396_write(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
69} 69}
70 70
71static void hifier_init(struct oxygen *chip) 71static void hifier_registers_init(struct oxygen *chip)
72{ 72{
73 struct hifier_data *data = chip->model_data; 73 struct hifier_data *data = chip->model_data;
74 74
75 data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
76 ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN); 75 ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
77 ak4396_write(chip, AK4396_CONTROL_2, data->ak4396_ctl2); 76 ak4396_write(chip, AK4396_CONTROL_2, data->ak4396_ctl2);
78 ak4396_write(chip, AK4396_CONTROL_3, AK4396_PCM); 77 ak4396_write(chip, AK4396_CONTROL_3, AK4396_PCM);
79 update_ak4396_volume(chip); 78 update_ak4396_volume(chip);
79}
80
81static void hifier_init(struct oxygen *chip)
82{
83 struct hifier_data *data = chip->model_data;
84
85 data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
86 hifier_registers_init(chip);
80 87
81 snd_component_add(chip->card, "AK4396"); 88 snd_component_add(chip->card, "AK4396");
82 snd_component_add(chip->card, "CS5340"); 89 snd_component_add(chip->card, "CS5340");