cleanup clock init in soc

zephyrproject-rtos · Jul 6, 2023 · da6c8ab · da6c8ab
1 parent 7ac54cf
commit da6c8ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
@@ -1073,16 +1073,6 @@ static void eth_mcux_init(const struct device *dev)
 			kENET_RxAccelProtoCheckEnabled;
 	}
 
-#ifdef CONFIG_ETH_MCUX_RMII_EXT_CLK
-	if(context->base == ENET) {
-		IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, true);
-		IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, false);
-	} else {
-		IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2RefClkMode, true);
-		IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2TxClkOutputDir, false);
-	}
-#endif
-
 	ENET_Init(context->base,
 		  &context->enet_handle,
 		  &enet_config,

diff --git a/soc/arm/nxp_imx/rt/soc_rt10xx.c b/soc/arm/nxp_imx/rt/soc_rt10xx.c
@@ -200,14 +200,26 @@ static ALWAYS_INLINE void clock_init(void)
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) && CONFIG_NET_L2_ETHERNET
 	/* Enable clock output for ENET1 */
-	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, true);
+#ifdef CONFIG_ETH_MCUX_RMII_EXT_CLK
+	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, true);
+	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, false);
+#else
+	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir |
+				kIOMUXC_GPR_ENET1RefClkMode, false);
+#endif
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet2), okay) && CONFIG_NET_L2_ETHERNET
+#ifdef CONFIG_ETH_MCUX_RMII_EXT_CLK
 	/* Set ENET2 ref clock to be generated by External OSC,*/
 	/* direction as output and frequency to 50MHz */
+	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2RefClkMode, true);
+	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2TxClkOutputDir, false);
+
+#else
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2TxClkOutputDir |
-				kIOMUXC_GPR_ENET2RefClkMode, true);
+				kIOMUXC_GPR_ENET2RefClkMode, false);
+#endif
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(usb1), okay) && CONFIG_USB_DC_NXP_EHCI