Add Framework13AmdAi300

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

framework_lib/src/ccgx/device.rs

@@ -44,8 +44,18 @@ impl PdPort {
             (Platform::GenericFramework((left, _), _, _), PdPort::Left01) => *left,
             (Platform::GenericFramework((_, right), _, _), PdPort::Right23) => *right,
             // Framework AMD Platforms (CCG8)
-            (Platform::Framework13Amd | Platform::Framework16, PdPort::Left01) => 0x42,
-            (Platform::Framework13Amd | Platform::Framework16, PdPort::Right23) => 0x40,
+            (
+                Platform::Framework13Amd7080
+                | Platform::Framework13AmdAi300
+                | Platform::Framework16Amd7080,
+                PdPort::Left01,
+            ) => 0x42,
+            (
+                Platform::Framework13Amd7080
+                | Platform::Framework13AmdAi300
+                | Platform::Framework16Amd7080,
+                PdPort::Right23,
+            ) => 0x40,
             // Framework Intel Platforms (CCG5 and CCG6)
             (_, PdPort::Left01) => 0x08,
             (_, PdPort::Right23) => 0x40,
@@ -64,11 +74,17 @@ impl PdPort {
             (Platform::IntelGen12 | Platform::IntelGen13, PdPort::Left01) => 6,
             (Platform::IntelGen12 | Platform::IntelGen13, PdPort::Right23) => 7,
             (
-                Platform::Framework13Amd | Platform::Framework16 | Platform::IntelCoreUltra1,
+                Platform::Framework13Amd7080
+                | Platform::Framework16Amd7080
+                | Platform::IntelCoreUltra1
+                | Platform::Framework13AmdAi300
                 PdPort::Left01,
             ) => 1,
             (
-                Platform::Framework13Amd | Platform::Framework16 | Platform::IntelCoreUltra1,
+                Platform::Framework13Amd7080
+                | Platform::Framework16Amd7080
+                | Platform::IntelCoreUltra1
+                | Platform::Framework13AmdAi300
                 PdPort::Right23,
             ) => 2,
             // (_, _) => Err(EcError::DeviceError(format!(

framework_lib/src/chromium_ec/mod.rs

@@ -125,9 +125,13 @@ pub fn has_mec() -> bool {
         return has_mec;
     }
 
+    // TODO: Should turn this around
     !matches!(
         smbios::get_platform().unwrap(),
-        Platform::Framework13Amd | Platform::Framework16 | Platform::IntelCoreUltra1
+        Platform::Framework13Amd7080
+            | Platform::Framework16Amd7080
+            | Platform::IntelCoreUltra1
+            | Platform::Framework13AmdAi300
     )
 }
 

framework_lib/src/power.rs

@@ -216,12 +216,12 @@ pub fn print_thermal(ec: &CrosEc) {
             println!("  PECI:         {:>4}", TempSensor::from(temps[4]));
             println!("  F57397_VCCGT: {:>4}", TempSensor::from(temps[5]));
         }
-        Some(Platform::Framework13Amd | Platform::Framework16) => {
+        Some(Platform::Framework13Amd7080 | Platform::Framework16Amd7080) => {
             println!("  F75303_Local: {:>4}", TempSensor::from(temps[0]));
             println!("  F75303_CPU:   {:>4}", TempSensor::from(temps[1]));
             println!("  F75303_DDR:   {:>4}", TempSensor::from(temps[2]));
             println!("  APU:          {:>4}", TempSensor::from(temps[3]));
-            if matches!(platform, Some(Platform::Framework16)) {
+            if matches!(platform, Some(Platform::Framework16Amd7080)) {
                 println!("  dGPU VR:      {:>4}", TempSensor::from(temps[4]));
                 println!("  dGPU VRAM:    {:>4}", TempSensor::from(temps[5]));
                 println!("  dGPU AMB:     {:>4}", TempSensor::from(temps[6]));
@@ -495,7 +495,7 @@ pub fn get_pd_info(ec: &CrosEc, ports: u8) -> Vec<EcResult<UsbPdPowerInfo>> {
 }
 
 pub fn get_and_print_pd_info(ec: &CrosEc) {
-    let fl16 = Some(crate::util::Platform::Framework16) == get_platform();
+    let fl16 = Some(crate::util::Platform::Framework16Amd7080) == get_platform();
     let ports = 4; // All our platforms have 4 PD ports so far
     let infos = get_pd_info(ec, ports);
     for (port, info) in infos.iter().enumerate().take(ports.into()) {

framework_lib/src/smbios.rs

@@ -262,10 +262,11 @@ pub fn get_platform() -> Option<Platform> {
         "Laptop" => Some(Platform::IntelGen11),
         "Laptop (12th Gen Intel Core)" => Some(Platform::IntelGen12),
         "Laptop (13th Gen Intel Core)" => Some(Platform::IntelGen13),
-        "Laptop 13 (AMD Ryzen 7040Series)" => Some(Platform::Framework13Amd),
-        "Laptop 13 (AMD Ryzen 7040 Series)" => Some(Platform::Framework13Amd),
+        "Laptop 13 (AMD Ryzen 7040Series)" => Some(Platform::Framework13Amd7080),
+        "Laptop 13 (AMD Ryzen 7040 Series)" => Some(Platform::Framework13Amd7080),
+        "Laptop 13 (AMD Ryzen AI 300 Series)" => Some(Platform::Framework13AmdAi300),
         "Laptop 13 (Intel Core Ultra Series 1)" => Some(Platform::IntelCoreUltra1),
-        "Laptop 16 (AMD Ryzen 7040 Series)" => Some(Platform::Framework16),
+        "Laptop 16 (AMD Ryzen 7040 Series)" => Some(Platform::Framework16Amd7080),
         _ => None,
     };
 

framework_lib/src/util.rs

@@ -25,10 +25,12 @@ pub enum Platform {
     IntelGen13,
     /// Framework 13 - Intel Core Ultra Series 1, Codenamed MeteorLake
     IntelCoreUltra1,
-    /// Framework 13 - AMD Ryzen
-    Framework13Amd,
-    /// Framework 16
-    Framework16,
+    /// Framework 13 - AMD Ryzen 7080 Series
+    Framework13Amd7080,
+    /// Framework 13 - AMD Ryzen AI 300 Series
+    Framework13AmdAi300,
+    /// Framework 16 - AMD Ryzen 7080 Series
+    Framework16Amd7080,
     /// Generic Framework device
     /// pd_addrs, pd_ports, has_mec
     GenericFramework((u16, u16), (u8, u8), bool),