michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "samples: usb-audio: add app.overlay and remove board specific overlays"

Browse source 
This reverts commit e53371bbc0bc37d911884937199733f23c43fb21.
The "usbd0 aliases" approach has not proven to work.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-08-05 16:31:29 +02:00 • committed by Carles Cufí
commit e38e91ed16
8 changed files with 84 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

24
samples/subsys/usb/audio/headphones_microphone/app.overlay
View file

@ -1,24 +0,0 @@
/*
* Copyright (c) 2019 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
/ {
usbd0 {
hp_0 {
label = "HEADPHONES";
compatible = "usb-audio-hp";
feature-mute;
channel-l;
channel-r;
};
mic_0 {
label = "MICROPHONE";
compatible = "usb-audio-mic";
feature-mute;
channel-l;
channel-r;
};
};
};

22
samples/subsys/usb/audio/headphones_microphone/boards/nrf52840dk_nrf52840.overlay Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2019 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
&usbd {
hp_0 {
label = "HEADPHONES";
compatible = "usb-audio-hp";
feature-mute;
channel-l;
channel-r;
};
mic_0 {
label = "MICROPHONE";
compatible = "usb-audio-mic";
feature-mute;
channel-l;
channel-r;
};
};

22
samples/subsys/usb/audio/headphones_microphone/boards/nrf5340dk_nrf5340_cpuapp.overlay Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2020 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
&usbd {
hp_0 {
label = "HEADPHONES";
compatible = "usb-audio-hp";
feature-mute;
channel-l;
channel-r;
};
mic_0 {
label = "MICROPHONE";
compatible = "usb-audio-mic";
feature-mute;
channel-l;
channel-r;
};
};

5
samples/subsys/usb/audio/headphones_microphone/sample.yaml
View file

@ -4,10 +4,7 @@ tests:
sample.usb.audio.headphones_microphone: sample.usb.audio.headphones_microphone:
depends_on: usb_device depends_on: usb_device
tags: usb tags: usb
filter: dt_alias_exists("usbd0") platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
integration_platforms:
- nrf52840dk_nrf52840
- nrf5340dk_nrf5340_cpuapp
harness: console harness: console
harness_config: harness_config:
type: multi_line type: multi_line

21
samples/subsys/usb/audio/headset/app.overlay
View file

@ -1,21 +0,0 @@
/*
* Copyright (c) 2019 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
/ {
usbd0 {
hs_0 {
label = "HEADSET";
compatible = "usb-audio-hs";
mic-feature-mute;
mic-channel-l;
mic-channel-r;
hp-feature-mute;
hp-channel-l;
hp-channel-r;
};
};
};

19
samples/subsys/usb/audio/headset/boards/nrf52840dk_nrf52840.overlay Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2019 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
&usbd {
hs_0 {
label = "HEADSET";
compatible = "usb-audio-hs";
mic-feature-mute;
mic-channel-l;
mic-channel-r;
hp-feature-mute;
hp-channel-l;
hp-channel-r;
};
};

19
samples/subsys/usb/audio/headset/boards/nrf5340dk_nrf5340_cpuapp.overlay Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2020 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
&usbd {
hs_0 {
label = "HEADSET";
compatible = "usb-audio-hs";
mic-feature-mute;
mic-channel-l;
mic-channel-r;
hp-feature-mute;
hp-channel-l;
hp-channel-r;
};
};

5
samples/subsys/usb/audio/headset/sample.yaml
View file

@ -4,10 +4,7 @@ tests:
sample.usb.audio.headset: sample.usb.audio.headset:
depends_on: usb_device depends_on: usb_device
tags: usb tags: usb
filter: dt_alias_exists("usbd0") platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
integration_platforms:
- nrf52840dk_nrf52840
- nrf5340dk_nrf5340_cpuapp
harness: console harness: console
harness_config: harness_config:
type: multi_line type: multi_line