Merge pull request #14 from hao-yao/main

LNL PV release candidate on 2024-09-29
intel · Sep 30, 2024 · 526ed27 · 526ed27
2 parents 8358a29 + 5c64723
commit 526ed27
Show file tree

Hide file tree

Showing 39 changed files with 2,033 additions and 4,872 deletions.
diff --git a/drivers/media/pci/intel/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/media/pci/intel/ipu7/abi/ipu7_fw_boot_abi.h
diff --git a/drivers/media/pci/intel/ipu7/abi/ipu7_fw_common_abi.h b/drivers/media/pci/intel/ipu7/abi/ipu7_fw_common_abi.h
diff --git a/drivers/media/pci/intel/ipu7/abi/ipu7_fw_config_abi.h b/drivers/media/pci/intel/ipu7/abi/ipu7_fw_config_abi.h
@@ -8,22 +8,12 @@
 
 #include <linux/types.h>
 
-#define IPU_CONFIG_ABI_WDT_TIMER_DISABLED 0U
-#define IPU_CONFIG_ABI_CMD_TIMER_DISABLED 0U
+#define IPU_CONFIG_ABI_WDT_TIMER_DISABLED	0U
+#define IPU_CONFIG_ABI_CMD_TIMER_DISABLED	0U
 
-/** HW watchdog configuration */
 struct ipu7_wdt_abi {
-	/**
-	 * HW WDT timer#1 timeout value, provided in uSec.
-	 * If value of zero used WDT will be disabled.
-	 */
-	uint32_t wdt_timer1_us;
-
-	/**
-	 * HW WDT timer#2 timeout value, provided in uSec.
-	 * If value of zero used WDT will be disabled.
-	 */
-	uint32_t wdt_timer2_us;
+	u32 wdt_timer1_us;
+	u32 wdt_timer2_us;
 };
 
 #endif
diff --git a/drivers/media/pci/intel/ipu7/abi/ipu7_fw_insys_config_abi.h b/drivers/media/pci/intel/ipu7/abi/ipu7_fw_insys_config_abi.h
@@ -6,22 +6,13 @@
 #ifndef IPU7_FW_INSYS_CONFIG_ABI_H
 #define IPU7_FW_INSYS_CONFIG_ABI_H
 
-#include "ipu7_fw_config_abi.h"
 #include "ipu7_fw_boot_abi.h"
+#include "ipu7_fw_config_abi.h"
 #include "ipu7_fw_isys_abi.h"
 
-/**
- * INSYS specific config.
- */
 struct ipu7_insys_config {
-	/**
-	 * timeout val in millisecond.
-	 */
-	uint32_t timeout_val_ms;
-	/**  @see ia_gofo_boot_config.subsys_config */
+	u32 timeout_val_ms;
 	struct ia_gofo_logger_config logger_config;
-
-	/** HW watchdog configuration */
 	struct ipu7_wdt_abi wdt_config;
 };