magister: update audio ucm and cras settings
Update audio ucm and cras settings
BUG=b:192918835 b:189747355
TEST=emerge-dedede chromeos-bsp-dedede
Change-Id: I8fe669bf4895b9b5cc1a9693c316e22fb331f2a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/board-overlays/+/3020542
Tested-by: David Wu <david_wu@quanta.corp-partner.google.com>
Commit-Queue: Henry Sun <henrysun@google.com>
Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Reviewed-by: Henry Sun <henrysun@google.com>
(cherry picked from commit dd1e7bf840d971a020d5709dbe6504d624fcb9ec)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/board-overlays/+/3093835
diff --git a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/card_settings b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/card_settings
index ac6edd4..3e55be7 100644
--- a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/card_settings
+++ b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/card_settings
@@ -1,100 +1,100 @@
[Speaker]
volume_curve = explicit
- db_at_100 = -450
- db_at_99 = -510
- db_at_98 = -510
- db_at_97 = -580
- db_at_96 = -580
- db_at_95 = -650
- db_at_94 = -720
- db_at_93 = -720
- db_at_92 = -790
- db_at_91 = -790
- db_at_90 = -860
- db_at_89 = -930
- db_at_88 = -930
- db_at_87 = -1000
- db_at_86 = -1000
- db_at_85 = -1070
- db_at_84 = -1070
- db_at_83 = -1140
- db_at_82 = -1210
- db_at_81 = -1210
- db_at_80 = -1280
- db_at_79 = -1280
- db_at_78 = -1350
- db_at_77 = -1350
- db_at_76 = -1420
- db_at_75 = -1490
- db_at_74 = -1490
- db_at_73 = -1560
- db_at_72 = -1560
- db_at_71 = -1630
+ db_at_100 = -370
+ db_at_99 = -370
+ db_at_98 = -440
+ db_at_97 = -510
+ db_at_96 = -510
+ db_at_95 = -580
+ db_at_94 = -580
+ db_at_93 = -650
+ db_at_92 = -720
+ db_at_91 = -720
+ db_at_90 = -790
+ db_at_89 = -790
+ db_at_88 = -860
+ db_at_87 = -930
+ db_at_86 = -930
+ db_at_85 = -1000
+ db_at_84 = -1000
+ db_at_83 = -1070
+ db_at_82 = -1140
+ db_at_81 = -1140
+ db_at_80 = -1210
+ db_at_79 = -1210
+ db_at_78 = -1280
+ db_at_77 = -1280
+ db_at_76 = -1350
+ db_at_75 = -1420
+ db_at_74 = -1420
+ db_at_73 = -1490
+ db_at_72 = -1490
+ db_at_71 = -1560
db_at_70 = -1630
- db_at_69 = -1700
- db_at_68 = -1770
- db_at_67 = -1770
- db_at_66 = -1840
+ db_at_69 = -1630
+ db_at_68 = -1700
+ db_at_67 = -1700
+ db_at_66 = -1770
db_at_65 = -1840
- db_at_64 = -1910
- db_at_63 = -1980
- db_at_62 = -1980
- db_at_61 = -2050
+ db_at_64 = -1840
+ db_at_63 = -1910
+ db_at_62 = -1910
+ db_at_61 = -1980
db_at_60 = -2050
- db_at_59 = -2120
+ db_at_59 = -2050
db_at_58 = -2120
- db_at_57 = -2190
- db_at_56 = -2260
- db_at_55 = -2260
- db_at_54 = -2330
+ db_at_57 = -2120
+ db_at_56 = -2190
+ db_at_55 = -2190
+ db_at_54 = -2260
db_at_53 = -2330
- db_at_52 = -2400
+ db_at_52 = -2330
db_at_51 = -2400
- db_at_50 = -2470
- db_at_49 = -2540
+ db_at_50 = -2400
+ db_at_49 = -2470
db_at_48 = -2540
- db_at_47 = -2610
+ db_at_47 = -2540
db_at_46 = -2610
- db_at_45 = -2680
- db_at_44 = -2750
+ db_at_45 = -2610
+ db_at_44 = -2680
db_at_43 = -2750
- db_at_42 = -2820
+ db_at_42 = -2750
db_at_41 = -2820
- db_at_40 = -2890
+ db_at_40 = -2820
db_at_39 = -2890
db_at_38 = -2960
- db_at_37 = -3030
+ db_at_37 = -2960
db_at_36 = -3030
- db_at_35 = -3100
+ db_at_35 = -3030
db_at_34 = -3100
- db_at_33 = -3170
+ db_at_33 = -3100
db_at_32 = -3170
db_at_31 = -3240
- db_at_30 = -3310
+ db_at_30 = -3240
db_at_29 = -3310
- db_at_28 = -3380
+ db_at_28 = -3310
db_at_27 = -3380
db_at_26 = -3450
- db_at_25 = -3520
+ db_at_25 = -3450
db_at_24 = -3520
- db_at_23 = -3590
+ db_at_23 = -3520
db_at_22 = -3590
db_at_21 = -3660
db_at_20 = -3660
db_at_19 = -3730
- db_at_18 = -3800
+ db_at_18 = -3730
db_at_17 = -3800
db_at_16 = -3870
db_at_15 = -3870
db_at_14 = -3940
db_at_13 = -3940
db_at_12 = -4010
- db_at_11 = -4080
+ db_at_11 = -4010
db_at_10 = -4080
db_at_9 = -4150
db_at_8 = -4150
db_at_7 = -4220
- db_at_6 = -4290
+ db_at_6 = -4220
db_at_5 = -4290
db_at_4 = -4360
db_at_3 = -4360
@@ -104,4 +104,4 @@
[Headphone]
volume_curve = simple_step
volume_step = 70
- max_volume = -700
+ max_volume = -500
diff --git a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/dsp.ini b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/dsp.ini
index 3a7c3ea..b646fda 100644
--- a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/dsp.ini
+++ b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/cras-config/dsp.ini
@@ -23,13 +23,13 @@
input_4=1 ; emphasis_disabled
input_5=0 ; f
input_6=1 ; enable
-input_7=-10 ; threshold
-input_8=10 ; knee
-input_9=15 ; ratio
+input_7=-24 ; threshold
+input_8=30 ; knee
+input_9=12 ; ratio
input_10=0.003 ; attack
input_11=0.25 ; release
-input_12=-3.5 ; boost
-input_13=350 ; f
+input_12=1 ; boost
+input_13=200 ; f
input_14=1 ; enable
input_15=-24 ; threshold
input_16=30 ; knee
@@ -37,11 +37,11 @@
input_18=0.003 ; attack
input_19=0.25 ; release
input_20=1 ; boost
-input_21=10000 ; f
+input_21=2000 ; f
input_22=1 ; enable
-input_23=-10 ; threshold
-input_24=5 ; knee
-input_25=15 ; ratio
+input_23=-24 ; threshold
+input_24=30 ; knee
+input_25=12 ; ratio
input_26=0.003 ; attack
input_27=0.25 ; release
input_28=0 ; boost
@@ -53,67 +53,67 @@
input_1={intermediate:1}
output_2={dst:0}
output_3={dst:1}
-input_4=2 ; highpass
-input_5=450 ; freq
-input_6=0 ; Q
-input_7=0 ; gain
-input_8=2 ; highpass
-input_9=450 ; freq
-input_10=0 ; Q
-input_11=0 ; gain
+input_4=6 ; peaking
+input_5=2500 ; freq
+input_6=9 ; Q
+input_7=-1 ; gain
+input_8=6 ; peaking
+input_9=2500 ; freq
+input_10=7 ; Q
+input_11=-7.5 ; gain
input_12=6 ; peaking
-input_13=740 ; freq
-input_14=5 ; Q
-input_15=-7 ; gain
+input_13=800 ; freq
+input_14=9 ; Q
+input_15=-1 ; gain
input_16=6 ; peaking
-input_17=760 ; freq
-input_18=5 ; Q
-input_19=-7 ; gain
+input_17=800 ; freq
+input_18=9 ; Q
+input_19=-1 ; gain
input_20=6 ; peaking
-input_21=1500 ; freq
-input_22=2 ; Q
-input_23=-2 ; gain
+input_21=1000 ; freq
+input_22=3 ; Q
+input_23=-3 ; gain
input_24=6 ; peaking
-input_25=1500 ; freq
-input_26=2 ; Q
-input_27=-2 ; gain
+input_25=1120 ; freq
+input_26=6 ; Q
+input_27=-6 ; gain
input_28=6 ; peaking
-input_29=4000 ; freq
-input_30=4 ; Q
-input_31=-7 ; gain
+input_29=1500 ; freq
+input_30=9 ; Q
+input_31=-3 ; gain
input_32=6 ; peaking
-input_33=4000 ; freq
-input_34=4 ; Q
-input_35=-7 ; gain
-input_36=6 ; peaking
-input_37=1200 ; freq
-input_38=2.5 ; Q
-input_39=-3 ; gain
-input_40=6 ; peaking
-input_41=1200 ; freq
-input_42=2.5 ; Q
-input_43=-3 ; gain
-input_44=2 ; highpass
-input_45=350 ; freq
-input_46=0 ; Q
-input_47=-7 ; gain
-input_48=2 ; highpass
-input_49=350 ; freq
-input_50=0 ; Q
-input_51=-7 ; gain
+input_33=1500 ; freq
+input_34=9 ; Q
+input_35=-3 ; gain
+input_36=2 ; highpass
+input_37=200 ; freq
+input_38=0 ; Q
+input_39=16 ; gain
+input_40=2 ; highpass
+input_41=200 ; freq
+input_42=0 ; Q
+input_43=0 ; gain
+input_44=6 ; peaking
+input_45=2000 ; freq
+input_46=9 ; Q
+input_47=-3 ; gain
+input_48=6 ; peaking
+input_49=2000 ; freq
+input_50=9 ; Q
+input_51=-3 ; gain
input_52=6 ; peaking
-input_53=11000 ; freq
-input_54=1 ; Q
-input_55=-3 ; gain
+input_53=13000 ; freq
+input_54=6 ; Q
+input_55=2 ; gain
input_56=6 ; peaking
-input_57=11000 ; freq
-input_58=1 ; Q
-input_59=-3 ; gain
-input_60=1 ; lowpass
-input_61=19500 ; freq
-input_62=0 ; Q
-input_63=0 ; gain
-input_64=1 ; lowpass
-input_65=19500 ; freq
-input_66=0 ; Q
-input_67=0 ; gain
+input_57=13000 ; freq
+input_58=6 ; Q
+input_59=2 ; gain
+input_60=6 ; peaking
+input_61=270 ; freq
+input_62=6 ; Q
+input_63=-6 ; gain
+input_64=6 ; peaking
+input_65=270 ; freq
+input_66=6 ; Q
+input_67=-6 ; gain
diff --git a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/ucm-config/sof-rt5682.magister.2mic/HiFi.conf b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/ucm-config/sof-rt5682.magister.2mic/HiFi.conf
index 726459b..2f11bcd 100644
--- a/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/ucm-config/sof-rt5682.magister.2mic/HiFi.conf
+++ b/overlay-dedede/chromeos-base/chromeos-bsp-dedede/files/magister/audio/ucm-config/sof-rt5682.magister.2mic/HiFi.conf
@@ -113,24 +113,14 @@
]
}
-SectionDevice."Front Mic".0 {
+SectionDevice."Internal Mic".0 {
Value {
CapturePCM "hw:sofrt5682,5"
CaptureChannelMap "0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1"
- IntrinsicSensitivity "-3200"
- DspName "dmic_eq"
+ IntrinsicSensitivity "-2600"
}
}
-SectionDevice."Rear Mic".0 {
- Value {
- CapturePCM "hw:sofrt5682,5"
- CaptureChannelMap "3 3 -1 -1 -1 -1 -1 -1 -1 -1 -1"
- IntrinsicSensitivity "-3200"
- DspName "dmic_eq"
- }
-}
-
SectionDevice."HDMI1".0 {
Value {
PlaybackPCM "hw:sofrt5682,2"