amd: uuids: Renumber acp_sw_audio and acp_clk UUIDs

These two drivers both got cloned UUIDs from the acp_hs component, which is illegal. Renumber them. This is relatively safe, as clock and DMA drivers are specific to a platform and not referenced via external files like topology. Signed-off-by: Andy Ross <[email protected]>
andyross · Jul 4, 2024 · 73d60d4 · 73d60d4
1 parent c14bb77
commit 73d60d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/drivers/amd/rembrandt/acp_sw_audio_dma.c b/src/drivers/amd/rembrandt/acp_sw_audio_dma.c
@@ -13,9 +13,11 @@
 #include <sof/trace/trace.h>
 
 #ifdef CONFIG_ACP_6_3
-/*b414df09-9e31-4c59-8657-7afc8deba70c*/
-SOF_DEFINE_UUID("acp_sw_audio", acp_sw_audio_uuid, 0xb414df09, 0x9e31, 0x4c59,
- 0x86, 0x57, 0x7a, 0xfc, 0x8d, 0xeb, 0xa7, 0x0c);
+
+/* 5871f3ca-dd92-4edb-8a94-d651dd208b1e */
+SOF_DEFINE_UUID("acp_sw_audio", acp_sw_audio_uuid, 0x5871f3ca, 0xdd92, 0x4edb,
+ 0x8a, 0x94, 0xd6, 0x51, 0xdd, 0x20, 0x8b, 0x1e);
+
 DECLARE_TR_CTX(acp_sw_audio_tr, SOF_UUID(acp_sw_audio_uuid), LOG_LEVEL_INFO);
 
 //initialization of soundwire-0 fifos(Audio, BT and HS)
@@ -520,4 +522,4 @@ const struct dma_ops acp_dai_sw_audio_dma_ops = {
  .get_attribute = acp_dai_sw_audio_dma_get_attribute,
 };
 
-#endif
+#endif
diff --git a/src/platform/amd/acp_6_3/lib/clk.c b/src/platform/amd/acp_6_3/lib/clk.c
@@ -40,9 +40,10 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/*b414df09-9e31-4c59-8657-7afc8deba70c*/
-SOF_DEFINE_UUID("acp_clk", acp_clk_uuid, 0xb414df09, 0x9e31, 0x4c59,
- 0x86, 0x57, 0x7a, 0xfc, 0x8d, 0xeb, 0xa7, 0x0c);
+/* f8a7091c-7d2d-4410-9bb5-55278378d59f */
+SOF_DEFINE_UUID("acp_clk", acp_clk_uuid, 0xf8a7091c, 0x7d2d, 0x4410,
+ 0x9b, 0xb5, 0x55, 0x27, 0x83, 0x78, 0xd5, 0x9f);
+
 DECLARE_TR_CTX(acp_clk_tr, SOF_UUID(acp_clk_uuid), LOG_LEVEL_INFO);
 
 const struct freq_table platform_cpu_freq[] = {