imxrt:Fix Ethernet Clocking

PetervdPerk-NXP · Aug 6, 2022 · bced1a3 · bced1a3
1 parent 6a2c1fb
commit bced1a3
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 29 deletions.
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h
@@ -1003,35 +1003,34 @@
 
 /* Analog ENET PLL Control Register */
 
-#define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT      (0)       /* Bits 0-1:    Controls the frequency of the ethernet0 reference clock */
-#define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_MASK       (0x3 << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
-#  define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_25MHZ    ((uint32_t)(0) << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
-#  define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_50MHZ    ((uint32_t)(1) << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
-#  define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_100MHZ   ((uint32_t)(2) << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
-#  define CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_125MHZ   ((uint32_t)(3) << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
-#define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT      (2)       /* Bits 0-1:    Controls the frequency of the ethernet1 reference clock */
-#define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_MASK       (0x3 << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
+#define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT      (0)       /* Bits 0-1:    Controls the frequency of the ethernet0 reference clock */
+#define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_MASK       (0x3 << CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_SHIFT)
 #  define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_25MHZ    ((uint32_t)(0) << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
 #  define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_50MHZ    ((uint32_t)(1) << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
 #  define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_100MHZ   ((uint32_t)(2) << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
 #  define CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_125MHZ   ((uint32_t)(3) << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
+#define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_SHIFT      (2)       /* Bits 0-1:    Controls the frequency of the ethernet1 reference clock */
+#define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_MASK       (0x3 << CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_SHIFT)
+#  define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_25MHZ    ((uint32_t)(0) << CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_SHIFT)
+#  define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_50MHZ    ((uint32_t)(1) << CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_SHIFT)
+#  define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_100MHZ   ((uint32_t)(2) << CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_SHIFT)
+#  define CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_125MHZ   ((uint32_t)(3) << CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_SHIFT)
                                                                   /* Bits 4-11:  Reserved */
 #define CCM_ANALOG_PLL_ENET_POWERDOWN                   (1 << 12) /* Bit 12:     Powers down the PLL */
-#define CCM_ANALOG_PLL_ENET_ENET1_125M_EN               (1 << 13) /* Bit 13:     Enable the PLL providing the ENET1 125 MHz reference clock */
-#define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT       (14)       /* Bits 14-15: Determines the bypass source */
-#define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_MASK        (0x3 << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT)
-#  define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_REF_24M   ((uint32_t)(0) << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT) /* Select 24Mhz Osc as source */
-#  define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_CLK1      ((uint32_t)(1) << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT) /* Select the CLK1_N / CLK1_P as source */
-#define CCM_ANALOG_PLL_ENET_BYPASS                     (1 << 16)                                                   /* Bit 16:     Bypass the PLL */
+#define CCM_ANALOG_PLL_ENET_ENABLE                      (1 << 13) /* Bit 13:     Enable the PLL providing the ENET1 125 MHz reference clock */
+#define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT        (14)      /* Bits 14-15: Determines the bypass source */
+#define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_MASK         (0x3 << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT)
+#  define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_REF_24M    ((uint32_t)(0) << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT) /* Select 24Mhz Osc as source */
+#  define CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_CLK1       ((uint32_t)(1) << CCM_ANALOG_PLL_ENET_BYPASS_CLK_SRC_SHIFT) /* Select the CLK1_N / CLK1_P as source */
+#define CCM_ANALOG_PLL_ENET_BYPASS                      (1 << 16)                                                   /* Bit 16:     Bypass the PLL */
+
+/* Bit 19-17 Reserved */
+
+#define CCM_ANALOG_PLL_ENET_ENET2_25M_REF_EN           (1 << 20) /* Bit 20:     Enable the PLL providing the ENET2 reference clock */
+#define CCM_ANALOG_PLL_ENET_ENET1_25M_REF_EN           (1 << 21) /* Bit 21:     Enable the PLL providing ENET 25 MHz reference clock */
+
+/* Bit 30-22 Reserved */
 
-/*                                                                  Bit 17:
- *                                                                  Reserved
- */
-#define CCM_ANALOG_PLL_ENET_PFD_OFFSET_EN              (1 << 18) /* Bit 18:     Enables an offset in the phase frequency detector */
-#define CCM_ANALOG_PLL_ENET_ENABLE_125M                (1 << 19) /* Bit 19:     */
-#define CCM_ANALOG_PLL_ENET_ENET2_125M_EN              (1 << 20) /* Bit 20:     Enable the PLL providing the ENET2 125 MHz reference clock */
-#define CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN            (1 << 21) /* Bit 21:     Enable the PLL providing ENET 25 MHz reference clock */
-#define CCM_ANALOG_PLL_ENET_ENET_500M_REF_EN           (1 << 22) /* Bit 22:     Enable the PLL providing NET 500 MHz reference clock */
 #define CCM_ANALOG_PLL_ENET_LOCK                       (1 << 31) /* Bit 31:     PLL is currently locked */
 
 /* 480MHz Clock (PLL3) Phase Fractional Divider Control Register */

diff --git a/arch/arm/src/imxrt/imxrt_clockconfig.c b/arch/arm/src/imxrt/imxrt_clockconfig.c
@@ -269,21 +269,34 @@ static void imxrt_pllsetup(void)
   imxrt_lcd_clockconfig();
 #endif
 
+#if defined(CONFIG_IMXRT_ENET)
   /* Init ENET PLL6 */
-
-  reg    = CCM_ANALOG_PLL_ENET_ENET0_DIV_SELECT_50MHZ |
-           CCM_ANALOG_PLL_ENET_ENET1_125M_EN          |
-           CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN        |
-           CCM_ANALOG_PLL_ENET_ENET_500M_REF_EN       |
-           CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_50MHZ;
+#   if defined(CONFIG_IMXRT_ENET1)
+  reg    = CCM_ANALOG_PLL_ENET_ENET1_DIV_SELECT_50MHZ |
+           CCM_ANALOG_PLL_ENET_ENABLE                 |
+#     if defined(IMXRT_MAC_PROVIDES_TXC)
+           CCM_ANALOG_PLL_ENET_ENET1_25M_REF_EN;
+#     else
+           0;
+#     endif
+#   endif
+#   if defined(CONFIG_IMXRT_ENET2)
+  reg    = CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_50MHZ |
+           CCM_ANALOG_PLL_ENET_ENABLE                 |
+#     if defined(IMXRT_MAC_PROVIDES_TXC)
+           CCM_ANALOG_PLL_ENET_ENET2_25M_REF_EN;
+#     else
+           0;
+#     endif
+#   endif
 
   putreg32(reg, IMXRT_CCM_ANALOG_PLL_ENET);
 
   while ((getreg32(IMXRT_CCM_ANALOG_PLL_ENET) &
           CCM_ANALOG_PLL_ENET_LOCK) == 0)
     {
     }
-
+#endif
 #elif defined(CONFIG_ARCH_FAMILY_IMXRT102x)
   /* Init Sys PLL2 */