From 39e82b76a48da6e051af16aa34575aba0d1b8aa6 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 19 Oct 2023 21:01:17 -0500
Subject: [PATCH 1/2] rcc: solve data mutability

---
 stm32-data-gen/src/rcc.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/stm32-data-gen/src/rcc.rs b/stm32-data-gen/src/rcc.rs
index 749f5cb..845316a 100644
--- a/stm32-data-gen/src/rcc.rs
+++ b/stm32-data-gen/src/rcc.rs
@@ -1,3 +1,4 @@
+use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
 
 use anyhow::{anyhow, Ok};
@@ -256,7 +257,24 @@ impl PeripheralToClock {
                                     mux,
                                 };
 
-                                family_clocks.insert(peri.to_string(), res);
+                                match family_clocks.entry(peri.to_string()) {
+                                    Entry::Vacant(e) => {
+                                        e.insert(res);
+                                    }
+                                    Entry::Occupied(mut e) => {
+                                        if (e.get().clock != "pclk1" || e.get().clock != "hclk1")
+                                            && (res.clock == "pclk1" || res.clock == "hclk1")
+                                        {
+                                            e.insert(res);
+                                        } else if !(e.get().clock == "pclk1" || e.get().clock == "hclk1") {
+                                            return Err(anyhow!(
+                                                "rcc: duplicate entry for peri {} for rcc_{}",
+                                                peri.to_string(),
+                                                rcc_name
+                                            ));
+                                        }
+                                    }
+                                }
                             }
                         }
                     }

From e4b19a6fd997b8fb99a3de33836c1a8e05d36d8d Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 19 Oct 2023 21:06:26 -0500
Subject: [PATCH 2/2] rcc: fix l4 sw enum

---
 data/registers/rcc_l4.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/registers/rcc_l4.yaml b/data/registers/rcc_l4.yaml
index 3a674af..0d94017 100644
--- a/data/registers/rcc_l4.yaml
+++ b/data/registers/rcc_l4.yaml
@@ -2267,7 +2267,7 @@ enum/SW:
   - name: HSE
     description: HSE selected as system clock
     value: 2
-  - name: PLL1_P
+  - name: PLL1_R
     description: PLL selected as system clock
     value: 3
 enum/SWPMI1SEL: