From da68bc9bce9e54966ce42a9e776de53e020ce402 Mon Sep 17 00:00:00 2001
From: WeirdTreeThing <bradyn127@protonmail.com>
Date: Sun, 17 Sep 2023 15:24:33 -0400
Subject: [PATCH] jsl/sof-rt5682: Make Magpie UCM not specific to Magpie

Remove magpie from their names to allow for other devices in the future
to use the same UCM.
---
 .../{Magpie/HiFi.magpie.1mic.conf => HiFi.1mic.conf}   |  0
 ...gpie.1mic.rt5682vs.conf => HiFi.1mic.rt5682vs.conf} |  0
 .../{Magpie/HiFi.magpie.2mic.conf => HiFi.2mic.conf}   |  0
 ...magpie.rt1015p.1mic.conf => HiFi.rt1015p.1mic.conf} |  0
 ...magpie.rt1015p.2mic.conf => HiFi.rt1015p.2mic.conf} |  0
 jsl/sof-rt5682/sof-rt5682.conf                         | 10 +++++-----
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename jsl/sof-rt5682/{Magpie/HiFi.magpie.1mic.conf => HiFi.1mic.conf} (100%)
 rename jsl/sof-rt5682/{Magpie/HiFi.magpie.1mic.rt5682vs.conf => HiFi.1mic.rt5682vs.conf} (100%)
 rename jsl/sof-rt5682/{Magpie/HiFi.magpie.2mic.conf => HiFi.2mic.conf} (100%)
 rename jsl/sof-rt5682/{Magpie/HiFi.magpie.rt1015p.1mic.conf => HiFi.rt1015p.1mic.conf} (100%)
 rename jsl/sof-rt5682/{Magpie/HiFi.magpie.rt1015p.2mic.conf => HiFi.rt1015p.2mic.conf} (100%)

diff --git a/jsl/sof-rt5682/Magpie/HiFi.magpie.1mic.conf b/jsl/sof-rt5682/HiFi.1mic.conf
similarity index 100%
rename from jsl/sof-rt5682/Magpie/HiFi.magpie.1mic.conf
rename to jsl/sof-rt5682/HiFi.1mic.conf
diff --git a/jsl/sof-rt5682/Magpie/HiFi.magpie.1mic.rt5682vs.conf b/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf
similarity index 100%
rename from jsl/sof-rt5682/Magpie/HiFi.magpie.1mic.rt5682vs.conf
rename to jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf
diff --git a/jsl/sof-rt5682/Magpie/HiFi.magpie.2mic.conf b/jsl/sof-rt5682/HiFi.2mic.conf
similarity index 100%
rename from jsl/sof-rt5682/Magpie/HiFi.magpie.2mic.conf
rename to jsl/sof-rt5682/HiFi.2mic.conf
diff --git a/jsl/sof-rt5682/Magpie/HiFi.magpie.rt1015p.1mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf
similarity index 100%
rename from jsl/sof-rt5682/Magpie/HiFi.magpie.rt1015p.1mic.conf
rename to jsl/sof-rt5682/HiFi.rt1015p.1mic.conf
diff --git a/jsl/sof-rt5682/Magpie/HiFi.magpie.rt1015p.2mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf
similarity index 100%
rename from jsl/sof-rt5682/Magpie/HiFi.magpie.rt1015p.2mic.conf
rename to jsl/sof-rt5682/HiFi.rt1015p.2mic.conf
diff --git a/jsl/sof-rt5682/sof-rt5682.conf b/jsl/sof-rt5682/sof-rt5682.conf
index f0d09ff..9618e36 100644
--- a/jsl/sof-rt5682/sof-rt5682.conf
+++ b/jsl/sof-rt5682/sof-rt5682.conf
@@ -14,7 +14,7 @@ If.magpie {
 				String "${sys:devices/virtual/dmi/id/product_sku}"
 			}
 			True.SectionUseCase."HiFi" {
-				File "Magpie/HiFi.magpie.1mic.conf"
+				File "HiFi.1mic.conf"
 				Comment "Default"
 			}
 		}
@@ -25,7 +25,7 @@ If.magpie {
 				String "${sys:devices/virtual/dmi/id/product_sku}"
 			}
 			True.SectionUseCase."HiFi" {
-				File "Magpie/HiFi.magpie.2mic.conf"
+				File "HiFi.2mic.conf"
 				Comment "Default"
 			}
 		}
@@ -36,7 +36,7 @@ If.magpie {
 				String "${sys:devices/virtual/dmi/id/product_sku}"
 			}
 			True.SectionUseCase."HiFi" {
-				File "Magpie/HiFi.magpie.1mic.rt5682vs.conf"
+				File "HiFi.1mic.rt5682vs.conf"
 				Comment "Default"
 			}
 		}
@@ -47,7 +47,7 @@ If.magpie {
 				String "${sys:devices/virtual/dmi/id/product_sku}"
 			}
 			True.SectionUseCase."HiFi" {
-				File "Magpie/HiFi.magpie.rt1015p.1mic.conf"
+				File "HiFi.rt1015p.1mic.conf"
 				Comment "Default"
 			}
 		}
@@ -58,7 +58,7 @@ If.magpie {
 				String "${sys:devices/virtual/dmi/id/product_sku}"
 			}
 			True.SectionUseCase."HiFi" {
-				File "Magpie/HiFi.magpie.rt1015p.2mic.conf"
+				File "HiFi.rt1015p.2mic.conf"
 				Comment "Default"
 			}
 		}