From c75837751c58c70dd555f5f3e97e8f83b754144e Mon Sep 17 00:00:00 2001 From: chewitt Date: Sun, 17 May 2020 05:29:14 +0000 Subject: [PATCH] amlogic: add alsa-lib card conf/alias patches --- ...IC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch | 127 ++++++++++++++++++ ...002-add-Amlogic-cards-to-Makefile.am.patch | 25 ++++ ...03-add-Amlogic-cards-to-aliases.conf.patch | 59 ++++++++ 3 files changed, 211 insertions(+) create mode 100644 projects/Amlogic/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch create mode 100644 projects/Amlogic/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch create mode 100644 projects/Amlogic/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch diff --git a/projects/Amlogic/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch b/projects/Amlogic/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch new file mode 100644 index 0000000000..0c1ef886d6 --- /dev/null +++ b/projects/Amlogic/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch @@ -0,0 +1,127 @@ +From d8ac552041e7d7ae6f6f4542e5c59587adabdafa Mon Sep 17 00:00:00 2001 +From: chewitt +Date: Thu, 14 May 2020 13:31:34 +0000 +Subject: [PATCH 1/3] add AMLOGIC-HDMI and AMLOGIC-HDMI-SPDIF confs + +--- + src/conf/cards/AMLOGIC-HDMI-SPDIF.conf | 65 ++++++++++++++++++++++++++ + src/conf/cards/AMLOGIC-HDMI.conf | 35 ++++++++++++++ + 2 files changed, 100 insertions(+) + create mode 100644 src/conf/cards/AMLOGIC-HDMI-SPDIF.conf + create mode 100644 src/conf/cards/AMLOGIC-HDMI.conf + +diff --git a/src/conf/cards/AMLOGIC-HDMI-SPDIF.conf b/src/conf/cards/AMLOGIC-HDMI-SPDIF.conf +new file mode 100644 +index 00000000..49f706e9 +--- /dev/null ++++ b/src/conf/cards/AMLOGIC-HDMI-SPDIF.conf +@@ -0,0 +1,65 @@ ++# SPDX-License-Identifier: GPL-2.0 ++# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) ++ ++# NOTE: IEC958 controls are not currently implemented in the audio ++# driver, so control blocks are currently dummies. ++ ++ ++ ++AMLOGIC-HDMI-SPDIF.pcm.hdmi.0 { ++ @args [ CARD AES0 AES1 AES2 AES3 ] ++ @args.CARD { type string } ++ @args.AES0 { type integer } ++ @args.AES1 { type integer } ++ @args.AES2 { type integer } ++ @args.AES3 { type integer } ++ type hooks ++ slave.pcm { ++ type hw ++ card $CARD ++ device 0 ++ } ++ hooks.0 { ++ type ctl_elems ++ hook_args [ ++ { ++ interface MIXER ++ name "IEC958 Playback Default" ++ lock true ++ preserve true ++ optional true ++ value [ $AES0 $AES1 $AES2 $AES3 ] ++ } ++ ] ++ } ++} ++ ++ ++ ++AMLOGIC-HDMI-SPDIF.pcm.iec958.0 { ++ @args [ CARD AES0 AES1 AES2 AES3 ] ++ @args.CARD { type string } ++ @args.AES0 { type integer } ++ @args.AES1 { type integer } ++ @args.AES2 { type integer } ++ @args.AES3 { type integer } ++ type hooks ++ slave.pcm { ++ type hw ++ card $CARD ++ device 1 ++ } ++ hooks.0 { ++ type ctl_elems ++ hook_args [ ++ { ++ interface MIXER ++ name "IEC958 Playback Default" ++ lock true ++ preserve true ++ optional true ++ value [ $AES0 $AES1 $AES2 $AES3 ] ++ } ++ ] ++ } ++} +diff --git a/src/conf/cards/AMLOGIC-HDMI.conf b/src/conf/cards/AMLOGIC-HDMI.conf +new file mode 100644 +index 00000000..2cd62dce +--- /dev/null ++++ b/src/conf/cards/AMLOGIC-HDMI.conf +@@ -0,0 +1,35 @@ ++# SPDX-License-Identifier: GPL-2.0 ++# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) ++ ++# NOTE: IEC958 controls are not currently implemented in the audio ++# driver, so control blocks are currently dummies. ++ ++ ++ ++AMLOGIC-HDMI.pcm.hdmi.0 { ++ @args [ CARD AES0 AES1 AES2 AES3 ] ++ @args.CARD { type string } ++ @args.AES0 { type integer } ++ @args.AES1 { type integer } ++ @args.AES2 { type integer } ++ @args.AES3 { type integer } ++ type hooks ++ slave.pcm { ++ type hw ++ card $CARD ++ device 0 ++ } ++ hooks.0 { ++ type ctl_elems ++ hook_args [ ++ { ++ interface MIXER ++ name "IEC958 Playback Default" ++ lock true ++ preserve true ++ optional true ++ value [ $AES0 $AES1 $AES2 $AES3 ] ++ } ++ ] ++ } ++} +-- +2.17.1 + diff --git a/projects/Amlogic/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch b/projects/Amlogic/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch new file mode 100644 index 0000000000..fff2789090 --- /dev/null +++ b/projects/Amlogic/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch @@ -0,0 +1,25 @@ +From be0bc5ead26553ba338a3e4f6fd80a4d62ebe900 Mon Sep 17 00:00:00 2001 +From: chewitt +Date: Fri, 15 May 2020 06:12:43 +0000 +Subject: [PATCH 2/3] add Amlogic cards to Makefile.am + +--- + src/conf/cards/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am +index 00999f01..80f7ba6b 100644 +--- a/src/conf/cards/Makefile.am ++++ b/src/conf/cards/Makefile.am +@@ -2,6 +2,8 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ + alsadir = $(alsaconfigdir)/cards + cfg_files = aliases.conf \ + AACI.conf \ ++ AMLOGIC-HDMI.conf \ ++ AMLOGIC-HDMI-SPDIF.conf \ + ATIIXP.conf \ + ATIIXP-SPDMA.conf \ + ATIIXP-MODEM.conf \ +-- +2.17.1 + diff --git a/projects/Amlogic/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch b/projects/Amlogic/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch new file mode 100644 index 0000000000..d9e3ef92b5 --- /dev/null +++ b/projects/Amlogic/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch @@ -0,0 +1,59 @@ +From 10bfbd94a9228b4a3e92e72a35b98d47de26a7d6 Mon Sep 17 00:00:00 2001 +From: chewitt +Date: Thu, 14 May 2020 13:32:26 +0000 +Subject: [PATCH 3/3] add Amlogic cards to aliases.conf + +--- + src/conf/cards/aliases.conf | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf +index 18a920f4..d157a296 100644 +--- a/src/conf/cards/aliases.conf ++++ b/src/conf/cards/aliases.conf +@@ -58,6 +58,42 @@ CMI8787 cards.CMI8788 + pistachio cards.pistachio-card + VC4-HDMI cards.vc4-hdmi + ++# Amlogic HDMI ++GXBB-NANOPI-K2 cards.AMLOGIC-HDMI ++GXBB-ODROID-C2 cards.AMLOGIC-HDMI ++GXBB-NEXBOX-A95X cards.AMLOGIC-HDMI ++GXBB-P201 cards.AMLOGIC-HDMI ++GXBB-WETEK-HUB cards.AMLOGIC-HDMI ++GXL-LIBRETECH-S805X-AC cards.AMLOGIC-HDMI ++GXL-LIBRETECH-S905X-CC cards.AMLOGIC-HDMI ++GXL-LIBRETECH-S9XX-PC cards.AMLOGIC-HDMI ++GXL-S905X-P212 cards.AMLOGIC-HDMI ++GXM-KHADAS-VIM2 cards.AMLOGIC-HDMI ++G12A-SEI510 cards.AMLOGIC-HDMI ++G12B-GTKING-PRO cards.AMLOGIC-HDMI ++G12B-KHADAS-VIM3 cards.AMLOGIC-HDMI ++G12B-ODROID-N2 cards.AMLOGIC-HDMI ++SM1-A95XF3-AIR cards.AMLOGIC-HDMI ++SM1-KHADAS-VIM3L cards.AMLOGIC-HDMI ++SM1-ODROID-C4 cards.AMLOGIC-HDMI ++SM1-SEI610 cards.AMLOGIC-HDMI ++SM1-X96-AIR cards.AMLOGIC-HDMI ++ ++# Amlogic HDMI-SPDIF ++GXBB-P200 cards.AMLOGIC-HDMI-SPDIF ++GXBB-VEGA-S95 cards.AMLOGIC-HDMI-SPDIF ++GXBB-WETEK-PLAY2 cards.AMLOGIC-HDMI-SPDIF ++GX-P230-Q200 cards.AMLOGIC-HDMI-SPDIF ++GXM-NEXBOX-A1 cards.AMLOGIC-HDMI-SPDIF ++GXM-RBOX-PRO cards.AMLOGIC-HDMI-SPDIF ++GXM-WETEK-CORE2 cards.AMLOGIC-HDMI-SPDIF ++G12A-TANIX-TX5MAX cards.AMLOGIC-HDMI-SPDIF ++G12A-U200 cards.AMLOGIC-HDMI-SPDIF ++G12A-X96-MAX cards.AMLOGIC-HDMI-SPDIF ++G12B-GSKING-X cards.AMLOGIC-HDMI-SPDIF ++G12B-GTKING cards.AMLOGIC-HDMI-SPDIF ++G12B-UGOOS-AM6 cards.AMLOGIC-HDMI-SPDIF ++ + + + +-- +2.17.1 +