diff options
| author | Payam Moradshahi <payamm@google.com> | 2021-03-30 20:11:10 +0000 |
|---|---|---|
| committer | Payam Moradshahi <payamm@google.com> | 2021-03-30 22:05:42 +0000 |
| commit | 1038c3a4deef584963a2dd8701c5d54984c81e93 (patch) | |
| tree | 727530368153e4f340fdf7c85c865f2f7163c180 | |
| parent | e8becfd64f772fa67a1fa6894e0cdc229895d415 (diff) | |
| download | devicetree-1038c3a4deef584963a2dd8701c5d54984c81e93.tar.gz | |
[Smart Speaker] Add sample rate option for smart amp speaker
On Proto1 devices, default sample rate for UAIF1 is 16KHz. This bus
is shared between the microphone and speaker. This change allows
configures the speaker to also run at 16KHz.
On EVT+ devices, speaker lives on UAIF0 and has a default sample rate of
48KHz (since it is not sharing the bus with the microphone).
This CL allows the speaker driver to choose the proper sample rate based
on the devicetree node.
Test: Run alarm on Proto1 + EVT and confirm proper sample rate and sound
generation.
Bug: 180514440
Change-Id: I98d17a04fd718170220af8ee78005ecad6d60912
| -rw-r--r-- | r11_dev2_boe_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_btwifi_boe_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_btwifi_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_no_nfc_boe_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_no_nfc_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_swap_audio_no_nfc_auo_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_dev2_swap_audio_no_nfc_boe_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_evt1_btwifi_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_evt1_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_evt1_speaker.dtsi | 3 | ||||
| -rw-r--r-- | r11_proto11_no_nfc_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_proto1_btwifi_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_proto1_overlay.dts | 1 | ||||
| -rw-r--r-- | r11_proto1_speaker.dtsi | 3 |
15 files changed, 19 insertions, 0 deletions
diff --git a/r11_dev2_boe_overlay.dts b/r11_dev2_boe_overlay.dts index 8269bc7..b916c14 100644 --- a/r11_dev2_boe_overlay.dts +++ b/r11_dev2_boe_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_btwifi_boe_overlay.dts b/r11_dev2_btwifi_boe_overlay.dts index 44184b0..0a2e1f9 100644 --- a/r11_dev2_btwifi_boe_overlay.dts +++ b/r11_dev2_btwifi_boe_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_btwifi_overlay.dts b/r11_dev2_btwifi_overlay.dts index e9504f2..45872fa 100644 --- a/r11_dev2_btwifi_overlay.dts +++ b/r11_dev2_btwifi_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_no_nfc_boe_overlay.dts b/r11_dev2_no_nfc_boe_overlay.dts index f0f8e8a..4935380 100644 --- a/r11_dev2_no_nfc_boe_overlay.dts +++ b/r11_dev2_no_nfc_boe_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_no_nfc_overlay.dts b/r11_dev2_no_nfc_overlay.dts index 65d4f7f..4e3d98f 100644 --- a/r11_dev2_no_nfc_overlay.dts +++ b/r11_dev2_no_nfc_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_overlay.dts b/r11_dev2_overlay.dts index 90c7de2..f142985 100644 --- a/r11_dev2_overlay.dts +++ b/r11_dev2_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_swap_audio_no_nfc_auo_overlay.dts b/r11_dev2_swap_audio_no_nfc_auo_overlay.dts index 3ca61fc..6f40f33 100644 --- a/r11_dev2_swap_audio_no_nfc_auo_overlay.dts +++ b/r11_dev2_swap_audio_no_nfc_auo_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_dev2_swap_audio_no_nfc_boe_overlay.dts b/r11_dev2_swap_audio_no_nfc_boe_overlay.dts index 3afc4d7..30e8ab9 100644 --- a/r11_dev2_swap_audio_no_nfc_boe_overlay.dts +++ b/r11_dev2_swap_audio_no_nfc_boe_overlay.dts @@ -22,6 +22,7 @@ #include "r11_dev2_battery.dtsi" #include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_evt1_btwifi_overlay.dts b/r11_evt1_btwifi_overlay.dts index d9d662a..258d84d 100644 --- a/r11_evt1_btwifi_overlay.dts +++ b/r11_evt1_btwifi_overlay.dts @@ -22,6 +22,7 @@ #include "r11_evt1_battery.dtsi" #include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_evt1_overlay.dts b/r11_evt1_overlay.dts index 904b427..8bbec35 100644 --- a/r11_evt1_overlay.dts +++ b/r11_evt1_overlay.dts @@ -22,6 +22,7 @@ #include "r11_evt1_battery.dtsi" #include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_evt1_speaker.dtsi b/r11_evt1_speaker.dtsi new file mode 100644 index 0000000..3b7d603 --- /dev/null +++ b/r11_evt1_speaker.dtsi @@ -0,0 +1,3 @@ +&cs35l41 { + sample_rate_hz = <48000>; +};
\ No newline at end of file diff --git a/r11_proto11_no_nfc_overlay.dts b/r11_proto11_no_nfc_overlay.dts index c8869ef..75bc618 100644 --- a/r11_proto11_no_nfc_overlay.dts +++ b/r11_proto11_no_nfc_overlay.dts @@ -22,6 +22,7 @@ #include "r11_proto1_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_proto1_btwifi_overlay.dts b/r11_proto1_btwifi_overlay.dts index 6d6c076..e141078 100644 --- a/r11_proto1_btwifi_overlay.dts +++ b/r11_proto1_btwifi_overlay.dts @@ -22,6 +22,7 @@ #include "r11_proto1_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_proto1_overlay.dts b/r11_proto1_overlay.dts index 43f6340..9b4afb9 100644 --- a/r11_proto1_overlay.dts +++ b/r11_proto1_overlay.dts @@ -22,6 +22,7 @@ #include "r11_proto1_battery.dtsi" #include "r11_proto1_sound.dtsi" +#include "r11_proto1_speaker.dtsi" / { compatible = "google,r11"; diff --git a/r11_proto1_speaker.dtsi b/r11_proto1_speaker.dtsi new file mode 100644 index 0000000..eb84a64 --- /dev/null +++ b/r11_proto1_speaker.dtsi @@ -0,0 +1,3 @@ +&cs35l41 { + sample_rate_hz = <16000>; +};
\ No newline at end of file |