From 933ce97660479c595379e02d4c9ccf66500156bd Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Sun, 12 Nov 2023 15:54:06 -0500 Subject: [PATCH] Move HDMI configuration to codecs/hda This is the way upstream does it --- adl/sof-nau8825/HiFi.kano.conf | 2 +- adl/sof-nau8825/HiFi.osiris.conf | 2 +- adl/sof-rt5682/HiFi.banshee.conf | 2 +- adl/sof-rt5682/HiFi.felwinter.conf | 2 +- adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf | 2 +- adl/sof-rt5682/HiFi.gimble.conf | 2 +- adl/sof-rt5682/HiFi.primus.conf | 2 +- adl/sof-rt5682/HiFi.primus.rt5682vs.conf | 2 +- adl/sof-rt5682/HiFi.redrix.conf | 2 +- adl/sof-rt5682/HiFi.taeko.conf | 2 +- adl/sof-rt5682/HiFi.taniks.conf | 2 +- adl/sof-ssp_amp/HiFi.vell.conf | 2 +- apl/sof-bxtda7219ma/HiFi.conf | 2 +- cml/sof-cml_max9839/HiFi.conf | 2 +- cml/sof-cml_rt1011_/HiFi.conf | 2 +- cml/sof-cmlda7219ma/HiFi.conf | 2 +- cml/sof-rt5682/HiFi.conf | 2 +- {common/hdmi => codecs/hda}/hdmi.conf | 0 {common/hdmi => codecs/hda}/hdmi234.conf | 2 +- {common/hdmi => codecs/hda}/hdmi2345.conf | 2 +- {common/hdmi => codecs/hda}/hdmi345.conf | 2 +- {common/hdmi => codecs/hda}/hdmi567.conf | 2 +- glk/sof-cs42l42/HiFi.conf | 2 +- glk/sof-glkda7219ma/HiFi.conf | 2 +- glk/sof-glkrt5682ma/HiFi.conf | 2 +- jsl/sof-cs42l42/HiFi.conf | 2 +- jsl/sof-da7219max98/HiFi.conf | 2 +- jsl/sof-rt5682/HiFi-Magolor.conf | 2 +- jsl/sof-rt5682/HiFi.1mic.conf | 2 +- jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf | 2 +- jsl/sof-rt5682/HiFi.2mic.conf | 2 +- jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf | 2 +- jsl/sof-rt5682/HiFi.rt1015p.1mic.conf | 2 +- jsl/sof-rt5682/HiFi.rt1015p.2mic.conf | 2 +- sof-rt5682/HiFi.conf | 2 +- tgl/sof-rt5682/HiFi.conf | 2 +- 36 files changed, 35 insertions(+), 35 deletions(-) rename {common/hdmi => codecs/hda}/hdmi.conf (100%) rename {common/hdmi => codecs/hda}/hdmi234.conf (89%) rename {common/hdmi => codecs/hda}/hdmi2345.conf (91%) rename {common/hdmi => codecs/hda}/hdmi345.conf (89%) rename {common/hdmi => codecs/hda}/hdmi567.conf (89%) diff --git a/adl/sof-nau8825/HiFi.kano.conf b/adl/sof-nau8825/HiFi.kano.conf index 1ec3007..ea827e1 100644 --- a/adl/sof-nau8825/HiFi.kano.conf +++ b/adl/sof-nau8825/HiFi.kano.conf @@ -114,4 +114,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-nau8825/HiFi.osiris.conf b/adl/sof-nau8825/HiFi.osiris.conf index 7060d57..7aea1d2 100644 --- a/adl/sof-nau8825/HiFi.osiris.conf +++ b/adl/sof-nau8825/HiFi.osiris.conf @@ -93,4 +93,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.banshee.conf b/adl/sof-rt5682/HiFi.banshee.conf index 3fdc01b..bd8ddbc 100644 --- a/adl/sof-rt5682/HiFi.banshee.conf +++ b/adl/sof-rt5682/HiFi.banshee.conf @@ -76,4 +76,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.felwinter.conf b/adl/sof-rt5682/HiFi.felwinter.conf index 355e4a2..78eafd8 100644 --- a/adl/sof-rt5682/HiFi.felwinter.conf +++ b/adl/sof-rt5682/HiFi.felwinter.conf @@ -75,4 +75,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf b/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf index 3fdc01b..bd8ddbc 100644 --- a/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf +++ b/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf @@ -76,4 +76,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.gimble.conf b/adl/sof-rt5682/HiFi.gimble.conf index 0c42b5a..cd700ce 100644 --- a/adl/sof-rt5682/HiFi.gimble.conf +++ b/adl/sof-rt5682/HiFi.gimble.conf @@ -125,4 +125,4 @@ SectionDevice."Mic" { } } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.primus.conf b/adl/sof-rt5682/HiFi.primus.conf index 67dcea9..28de0de 100644 --- a/adl/sof-rt5682/HiFi.primus.conf +++ b/adl/sof-rt5682/HiFi.primus.conf @@ -118,4 +118,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.primus.rt5682vs.conf b/adl/sof-rt5682/HiFi.primus.rt5682vs.conf index acf1cb0..8ae4c68 100644 --- a/adl/sof-rt5682/HiFi.primus.rt5682vs.conf +++ b/adl/sof-rt5682/HiFi.primus.rt5682vs.conf @@ -105,4 +105,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.redrix.conf b/adl/sof-rt5682/HiFi.redrix.conf index 568312b..4c24158 100644 --- a/adl/sof-rt5682/HiFi.redrix.conf +++ b/adl/sof-rt5682/HiFi.redrix.conf @@ -130,4 +130,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.taeko.conf b/adl/sof-rt5682/HiFi.taeko.conf index c308dc1..84f27d5 100644 --- a/adl/sof-rt5682/HiFi.taeko.conf +++ b/adl/sof-rt5682/HiFi.taeko.conf @@ -115,4 +115,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-rt5682/HiFi.taniks.conf b/adl/sof-rt5682/HiFi.taniks.conf index fe13bc9..2f442d8 100644 --- a/adl/sof-rt5682/HiFi.taniks.conf +++ b/adl/sof-rt5682/HiFi.taniks.conf @@ -86,4 +86,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/adl/sof-ssp_amp/HiFi.vell.conf b/adl/sof-ssp_amp/HiFi.vell.conf index f016215..780b71c 100644 --- a/adl/sof-ssp_amp/HiFi.vell.conf +++ b/adl/sof-ssp_amp/HiFi.vell.conf @@ -91,4 +91,4 @@ SectionDevice."Mic" { } } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/apl/sof-bxtda7219ma/HiFi.conf b/apl/sof-bxtda7219ma/HiFi.conf index e8b7e64..3c39c42 100644 --- a/apl/sof-bxtda7219ma/HiFi.conf +++ b/apl/sof-bxtda7219ma/HiFi.conf @@ -84,4 +84,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/cml/sof-cml_max9839/HiFi.conf b/cml/sof-cml_max9839/HiFi.conf index e81d60d..9f0570f 100644 --- a/cml/sof-cml_max9839/HiFi.conf +++ b/cml/sof-cml_max9839/HiFi.conf @@ -126,4 +126,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/cml/sof-cml_rt1011_/HiFi.conf b/cml/sof-cml_rt1011_/HiFi.conf index ea37d86..fd9e117 100644 --- a/cml/sof-cml_rt1011_/HiFi.conf +++ b/cml/sof-cml_rt1011_/HiFi.conf @@ -92,4 +92,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/cml/sof-cmlda7219ma/HiFi.conf b/cml/sof-cmlda7219ma/HiFi.conf index b004a03..1ca0eb6 100644 --- a/cml/sof-cmlda7219ma/HiFi.conf +++ b/cml/sof-cmlda7219ma/HiFi.conf @@ -112,4 +112,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/cml/sof-rt5682/HiFi.conf b/cml/sof-rt5682/HiFi.conf index b7eb55b..ee45d16 100644 --- a/cml/sof-rt5682/HiFi.conf +++ b/cml/sof-rt5682/HiFi.conf @@ -126,4 +126,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/common/hdmi/hdmi.conf b/codecs/hda/hdmi.conf similarity index 100% rename from common/hdmi/hdmi.conf rename to codecs/hda/hdmi.conf diff --git a/common/hdmi/hdmi234.conf b/codecs/hda/hdmi234.conf similarity index 89% rename from common/hdmi/hdmi234.conf rename to codecs/hda/hdmi234.conf index 2c5d399..89b8acb 100644 --- a/common/hdmi/hdmi234.conf +++ b/codecs/hda/hdmi234.conf @@ -1,6 +1,6 @@ # HDA HDMI devices -Include.hdmi.File "/common/hdmi/hdmi.conf" +Include.hdmi.File "/codecs/hda/hdmi.conf" If.hdmi1 { Condition { Type AlwaysTrue } diff --git a/common/hdmi/hdmi2345.conf b/codecs/hda/hdmi2345.conf similarity index 91% rename from common/hdmi/hdmi2345.conf rename to codecs/hda/hdmi2345.conf index 15f7775..eacc7a6 100644 --- a/common/hdmi/hdmi2345.conf +++ b/codecs/hda/hdmi2345.conf @@ -1,6 +1,6 @@ # HDA HDMI devices -Include.hdmi.File "/common/hdmi/hdmi.conf" +Include.hdmi.File "/codecs/hda/hdmi.conf" If.hdmi1 { Condition { Type AlwaysTrue } diff --git a/common/hdmi/hdmi345.conf b/codecs/hda/hdmi345.conf similarity index 89% rename from common/hdmi/hdmi345.conf rename to codecs/hda/hdmi345.conf index 0956579..91f328d 100644 --- a/common/hdmi/hdmi345.conf +++ b/codecs/hda/hdmi345.conf @@ -1,6 +1,6 @@ # HDA HDMI devices -Include.hdmi.File "/common/hdmi/hdmi.conf" +Include.hdmi.File "/codecs/hda/hdmi.conf" If.hdmi1 { Condition { Type AlwaysTrue } diff --git a/common/hdmi/hdmi567.conf b/codecs/hda/hdmi567.conf similarity index 89% rename from common/hdmi/hdmi567.conf rename to codecs/hda/hdmi567.conf index 7cc25d2..32f5041 100644 --- a/common/hdmi/hdmi567.conf +++ b/codecs/hda/hdmi567.conf @@ -1,6 +1,6 @@ # HDA HDMI devices -Include.hdmi.File "/common/hdmi/hdmi.conf" +Include.hdmi.File "/codecs/hda/hdmi.conf" If.hdmi1 { Condition { Type AlwaysTrue } diff --git a/glk/sof-cs42l42/HiFi.conf b/glk/sof-cs42l42/HiFi.conf index e529ad8..3b1777c 100644 --- a/glk/sof-cs42l42/HiFi.conf +++ b/glk/sof-cs42l42/HiFi.conf @@ -91,4 +91,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/glk/sof-glkda7219ma/HiFi.conf b/glk/sof-glkda7219ma/HiFi.conf index b35b007..227658e 100644 --- a/glk/sof-glkda7219ma/HiFi.conf +++ b/glk/sof-glkda7219ma/HiFi.conf @@ -91,4 +91,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/glk/sof-glkrt5682ma/HiFi.conf b/glk/sof-glkrt5682ma/HiFi.conf index fc62d58..c290d49 100644 --- a/glk/sof-glkrt5682ma/HiFi.conf +++ b/glk/sof-glkrt5682ma/HiFi.conf @@ -114,4 +114,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi567.conf" +Include.hdmi.File "/codecs/hda/hdmi567.conf" diff --git a/jsl/sof-cs42l42/HiFi.conf b/jsl/sof-cs42l42/HiFi.conf index 263e2ab..339c20d 100644 --- a/jsl/sof-cs42l42/HiFi.conf +++ b/jsl/sof-cs42l42/HiFi.conf @@ -61,4 +61,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-da7219max98/HiFi.conf b/jsl/sof-da7219max98/HiFi.conf index 90f39dc..47296b9 100644 --- a/jsl/sof-da7219max98/HiFi.conf +++ b/jsl/sof-da7219max98/HiFi.conf @@ -86,4 +86,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi-Magolor.conf b/jsl/sof-rt5682/HiFi-Magolor.conf index 963d58e..b4eabcf 100644 --- a/jsl/sof-rt5682/HiFi-Magolor.conf +++ b/jsl/sof-rt5682/HiFi-Magolor.conf @@ -87,4 +87,4 @@ SectionDevice."Mic" { } } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.1mic.conf b/jsl/sof-rt5682/HiFi.1mic.conf index 3097936..5057d74 100644 --- a/jsl/sof-rt5682/HiFi.1mic.conf +++ b/jsl/sof-rt5682/HiFi.1mic.conf @@ -121,4 +121,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf b/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf index 48c81b8..0016512 100644 --- a/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf +++ b/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf @@ -112,4 +112,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.2mic.conf b/jsl/sof-rt5682/HiFi.2mic.conf index 145768f..ee651ae 100644 --- a/jsl/sof-rt5682/HiFi.2mic.conf +++ b/jsl/sof-rt5682/HiFi.2mic.conf @@ -142,4 +142,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf b/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf index 0184b85..8544052 100644 --- a/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf +++ b/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf @@ -109,4 +109,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf index d27edcc..ed0176d 100644 --- a/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf +++ b/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf @@ -116,4 +116,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf index 2d5bf8c..8374b2f 100644 --- a/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf +++ b/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf @@ -135,4 +135,4 @@ SectionDevice."Headset" { ] } -Include.hdmi.File "/common/hdmi/hdmi234.conf" +Include.hdmi.File "/codecs/hda/hdmi234.conf" diff --git a/sof-rt5682/HiFi.conf b/sof-rt5682/HiFi.conf index f9085e5..ea2107d 100644 --- a/sof-rt5682/HiFi.conf +++ b/sof-rt5682/HiFi.conf @@ -129,4 +129,4 @@ SectionDevice."Mic" { # TODO: detect hdmi configuration -#Include.hdmi.File "/common/hdmi/hdmi2345.conf" +#Include.hdmi.File "/codecs/hda/hdmi2345.conf" diff --git a/tgl/sof-rt5682/HiFi.conf b/tgl/sof-rt5682/HiFi.conf index 54a34e6..ba12507 100644 --- a/tgl/sof-rt5682/HiFi.conf +++ b/tgl/sof-rt5682/HiFi.conf @@ -55,4 +55,4 @@ SectionDevice."Mic" { } } -Include.hdmi.File "/common/hdmi/hdmi2345.conf" +Include.hdmi.File "/codecs/hda/hdmi2345.conf"