[sw,clkmgr,dif] Gate IO_DIV4 and external clock feature for Darjeeling

Signed-off-by: Robert Schilling <[email protected]>

Author: Razer6

sw/device/lib/dif/dif_clkmgr.c

@@ -56,6 +56,7 @@ static bool jitter_enable_register_is_locked(const dif_clkmgr_t *clkmgr) {
       CLKMGR_JITTER_REGWEN_EN_BIT);
 }
 
+#if OPENTITAN_CLKMGR_HAS_SW_EXTCLK_REGWEN
 /**
  * Checks if the external clock control register is locked.
  *
@@ -84,6 +85,7 @@ dif_result_t dif_clkmgr_external_clock_is_settled(const dif_clkmgr_t *clkmgr,
 
   return kDifOk;
 }
+#endif
 
 dif_result_t dif_clkmgr_jitter_enable_is_locked(const dif_clkmgr_t *clkmgr,
                                                 bool *is_locked) {
@@ -262,6 +264,7 @@ dif_result_t dif_clkmgr_hintable_clock_get_hint(
   return kDifOk;
 }
 
+#if OPENTITAN_CLKMGR_HAS_SW_EXTCLK_REGWEN
 dif_result_t dif_clkmgr_external_clock_control_is_locked(
     const dif_clkmgr_t *clkmgr, bool *is_locked) {
   if (clkmgr == NULL || is_locked == NULL) {
@@ -327,6 +330,7 @@ dif_result_t dif_clkmgr_external_clock_set_disabled(
                       extclk_ctrl_reg);
   return kDifOk;
 }
+#endif
 
 dif_result_t dif_clkmgr_measure_ctrl_disable(const dif_clkmgr_t *clkmgr) {
   if (clkmgr == NULL) {
@@ -500,6 +504,7 @@ dif_result_t dif_clkmgr_fatal_err_code_get_codes(
   return kDifOk;
 }
 
+#if OPENTITAN_CLKMGR_HAS_SW_EXTCLK_REGWEN
 dif_result_t dif_clkmgr_wait_for_ext_clk_switch(const dif_clkmgr_t *clkmgr) {
   if (clkmgr == NULL) {
     return kDifBadArg;
@@ -511,3 +516,4 @@ dif_result_t dif_clkmgr_wait_for_ext_clk_switch(const dif_clkmgr_t *clkmgr) {
   } while (ext_status != kMultiBitBool4True);
   return kDifOk;
 }
+#endif

sw/device/lib/dif/dif_clkmgr.h

@@ -94,29 +94,21 @@ typedef enum dif_clkmgr_recov_err_type {
    */
   kDifClkmgrRecovErrTypeShadowUpdate = 1u << 0,
   /**
-   * A recoverable measurement error for IO_DIV4 clock.
+   * A recoverable measurement error for IO clock.
    */
-  kDifClkmgrRecovErrTypeIoDiv4Meas = 1u << 1,
+  kDifClkmgrRecovErrTypeIoMeas = 1u << 1,
   /**
    * A recoverable measurement error for MAIN clock.
    */
   kDifClkmgrRecovErrTypeMainMeas = 1u << 2,
   /**
-   * A recoverable measurement error for USB clock.
-   */
-  kDifClkmgrRecovErrTypeUsbMeas = 1u << 3,
-  /**
-   * A recoverable timeout error for IO_DIV4 clock.
+   * A recoverable timeout error for IO clock.
    */
-  kDifClkmgrRecovErrTypeIoDiv4Timeout = 1u << 4,
+  kDifClkmgrRecovErrTypeIoTimeout = 1u << 3,
   /**
    * A recoverable timeout error for MAIN clock.
    */
-  kDifClkmgrRecovErrTypeMainTimeout = 1u << 5,
-  /**
-   * A recoverable timeout error for USB clock.
-   */
-  kDifClkmgrRecovErrTypeUsbTimeout = 1u << 6,
+  kDifClkmgrRecovErrTypeMainTimeout = 1u << 4,
 #else
 #error "dif_clkmgr does not support this top"
 #endif
@@ -327,6 +319,7 @@ dif_result_t dif_clkmgr_hintable_clock_get_hint(
     const dif_clkmgr_t *clkmgr, dif_clkmgr_hintable_clock_t clock,
     dif_toggle_t *state);
 
+#if defined(OPENTITAN_IS_EARLGREY)
 /**
  * Check if external clock control is locked.
  * @param clkmgr Clock Manager Handle.
@@ -380,6 +373,7 @@ dif_result_t dif_clkmgr_external_clock_set_disabled(const dif_clkmgr_t *clkmgr);
 OT_WARN_UNUSED_RESULT
 dif_result_t dif_clkmgr_external_clock_is_settled(const dif_clkmgr_t *clkmgr,
                                                   bool *status);
+#endif
 
 /**
  * Disable measurement control updates.
@@ -516,6 +510,7 @@ OT_WARN_UNUSED_RESULT
 dif_result_t dif_clkmgr_fatal_err_code_get_codes(
     const dif_clkmgr_t *clkmgr, dif_clkmgr_fatal_err_codes_t *codes);
 
+#if defined(OPENTITAN_IS_EARLGREY)
 /**
  * Wait for external clock switch to finish.
  *
@@ -524,6 +519,9 @@ dif_result_t dif_clkmgr_fatal_err_code_get_codes(
  */
 OT_WARN_UNUSED_RESULT
 dif_result_t dif_clkmgr_wait_for_ext_clk_switch(const dif_clkmgr_t *clkmgr);
+
+#endif
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus