diff --git a/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch b/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp15x-boards.patch similarity index 74% rename from recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch rename to recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp15x-boards.patch index 4302bed..05d29c8 100644 --- a/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch +++ b/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp15x-boards.patch @@ -1,23 +1,23 @@ -From d1e2b81cd739cc7019f3881b54328a583e437efa Mon Sep 17 00:00:00 2001 +From 0c54a55958a029e877f52148a138132d4bb664ef Mon Sep 17 00:00:00 2001 From: Olivier Moysan Date: Thu, 25 Apr 2019 11:47:16 +0200 -Subject: [PATCH 1/1] conf: add card configs for stm32mp1 boards +Subject: [PATCH 1/1] conf: add card configs for stm32mp15x boards -Add card configuration files for STM32MP1x-EV -and STM32MP1x-DK boards. +Add card configuration files for STM32MP15x-EV +and STM32MP15x-DK boards. Signed-off-by: Olivier Moysan --- - src/conf/cards/Makefile.am | 4 ++- - src/conf/cards/STM32MP1DK.conf | 47 +++++++++++++++++++++++++++++++ - src/conf/cards/STM32MP1EV.conf | 64 ++++++++++++++++++++++++++++++++++++++++++ - src/conf/cards/aliases.conf | 2 ++ + src/conf/cards/Makefile.am | 4 ++- + src/conf/cards/STM32MP15DK.conf | 47 ++++++++++++++++++++++++ + src/conf/cards/STM32MP15EV.conf | 64 +++++++++++++++++++++++++++++++++ + src/conf/cards/aliases.conf | 2 ++ 4 files changed, 116 insertions(+), 1 deletion(-) - create mode 100644 src/conf/cards/STM32MP1DK.conf - create mode 100644 src/conf/cards/STM32MP1EV.conf + create mode 100644 src/conf/cards/STM32MP15DK.conf + create mode 100644 src/conf/cards/STM32MP15EV.conf diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am -index 00999f0186d6..e565357df72c 100644 +index 00999f0186d6..c29d83144b31 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -58,7 +58,9 @@ cfg_files = aliases.conf \ @@ -26,20 +26,20 @@ index 00999f0186d6..e565357df72c 100644 VXPocket.conf \ - VXPocket440.conf + VXPocket440.conf \ -+ STM32MP1EV.conf \ -+ STM32MP1DK.conf ++ STM32MP15EV.conf \ ++ STM32MP15DK.conf if BUILD_ALISP cfg_files += aliases.alisp -diff --git a/src/conf/cards/STM32MP1DK.conf b/src/conf/cards/STM32MP1DK.conf +diff --git a/src/conf/cards/STM32MP15DK.conf b/src/conf/cards/STM32MP15DK.conf new file mode 100644 -index 000000000000..0a81fbe67149 +index 000000000000..b57cc69084ff --- /dev/null -+++ b/src/conf/cards/STM32MP1DK.conf ++++ b/src/conf/cards/STM32MP15DK.conf @@ -0,0 +1,47 @@ + + -+STM32MP1DK.pcm.front.0 { ++STM32MP15DK.pcm.front.0 { + @args [ CARD ] + @args.CARD { type string } + type asym @@ -52,7 +52,7 @@ index 000000000000..0a81fbe67149 + + + -+STM32MP1DK.pcm.default { ++STM32MP15DK.pcm.default { + @args [ CARD ] + @args.CARD { type string } + type asym @@ -70,7 +70,7 @@ index 000000000000..0a81fbe67149 + + + -+STM32MP1DK.pcm.hdmi.0 { ++STM32MP15DK.pcm.hdmi.0 { + @args [ CARD AES0 AES1 AES2 AES3 ] + @args.CARD { type string } + @args.AES0 { type integer } @@ -84,15 +84,15 @@ index 000000000000..0a81fbe67149 + device 2 + } +} -diff --git a/src/conf/cards/STM32MP1EV.conf b/src/conf/cards/STM32MP1EV.conf +diff --git a/src/conf/cards/STM32MP15EV.conf b/src/conf/cards/STM32MP15EV.conf new file mode 100644 -index 000000000000..2b0ae406c071 +index 000000000000..fc2e57e48746 --- /dev/null -+++ b/src/conf/cards/STM32MP1EV.conf ++++ b/src/conf/cards/STM32MP15EV.conf @@ -0,0 +1,64 @@ + + -+STM32MP1EV.pcm.front.0 { ++STM32MP15EV.pcm.front.0 { + @args [ CARD ] + @args.CARD { type string } + type asym @@ -105,7 +105,7 @@ index 000000000000..2b0ae406c071 + + + -+STM32MP1EV.pcm.default { ++STM32MP15EV.pcm.default { + @args [ CARD ] + @args.CARD { type string } + type asym @@ -123,7 +123,7 @@ index 000000000000..2b0ae406c071 + + + -+STM32MP1EV.pcm.iec958.0 { ++STM32MP15EV.pcm.iec958.0 { + @args [ CARD AES0 AES1 AES2 AES3 ] + @args.CARD { type string } + @args.AES0 { type integer } @@ -155,18 +155,18 @@ index 000000000000..2b0ae406c071 + } +} diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf -index 18a920f41e46..e6e1e5201cdf 100644 +index 18a920f41e46..30ce4d86a8e1 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788 CMI8787 cards.CMI8788 pistachio cards.pistachio-card VC4-HDMI cards.vc4-hdmi -+STM32MP1-EV cards.STM32MP1EV -+STM32MP1-DK cards.STM32MP1DK ++STM32MP15-EV cards.STM32MP15EV ++STM32MP15-DK cards.STM32MP15DK -- -2.7.4 +2.17.1 diff --git a/recipes-bsp/alsa/alsa-lib_%.bbappend b/recipes-bsp/alsa/alsa-lib_%.bbappend index bd32753..b011b56 100644 --- a/recipes-bsp/alsa/alsa-lib_%.bbappend +++ b/recipes-bsp/alsa/alsa-lib_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:" SRC_URI_append_stm32mpcommon = " \ - file://0001-conf-add-card-configs-for-stm32mp1-boards.patch \ + file://0001-conf-add-card-configs-for-stm32mp15x-boards.patch \ " diff --git a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.conf b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.conf index 71ad00d..6a8003a 100644 --- a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.conf +++ b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.conf @@ -1,17 +1,17 @@ pcm.!playback_codec { type hw - card STM32MP1DK + card STM32MP15DK device 0 } pcm.!record_codec { type hw - card STM32MP1DK + card STM32MP15DK device 1 } pcm.!playback_hdmi { type hw - card STM32MP1DK + card STM32MP15DK device 2 } diff --git a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.state b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.state index 009fc2a..7d5c041 100644 --- a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.state +++ b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-dk.state @@ -1,4 +1,4 @@ -state.STM32MP1DK { +state.STM32MP15DK { control.1 { iface MIXER name 'PCM Playback Volume' diff --git a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.conf b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.conf index a33782d..aa248f4 100644 --- a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.conf +++ b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.conf @@ -1,47 +1,47 @@ pcm.!playback_codec { type hw - card STM32MP1EV + card STM32MP15EV device 0 } pcm.!record_codec { type hw - card STM32MP1EV + card STM32MP15EV device 1 } pcm.!playback_spdif { type hw - card STM32MP1EV + card STM32MP15EV device 2 } pcm.!record_spdif { type hw - card STM32MP1EV + card STM32MP15EV device 3 } pcm.!record_dfsdm0 { type hw - card STM32MP1EV + card STM32MP15EV device 4 } pcm.!record_dfsdm1 { type hw - card STM32MP1EV + card STM32MP15EV device 5 } pcm.!record_dfsdm2 { type hw - card STM32MP1EV + card STM32MP15EV device 6 } pcm.!record_dfsdm3 { type hw - card STM32MP1EV + card STM32MP15EV device 7 } diff --git a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.state b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.state index 3742145..eaf8a8d 100644 --- a/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.state +++ b/recipes-bsp/alsa/alsa-state-stm32mp1/asound-stm32mp15yx-ev.state @@ -1,4 +1,4 @@ -state.STM32MP1EV { +state.STM32MP15EV { control.1 { iface MIXER name 'AIF1.1 DRC'