Message ID | 20240629024735.393050-1-festevam@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] ARM: mach-imx: imx6sx: Remove Ethernet refclock setting | expand |
On Fri, Jun 28, 2024 at 11:47:35PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <festevam@denx.de> > > The Ethernet refclock configuration is board specific and should > not be harcoded in machine code. > > Remove it to align with the imx6ul commit e87f3be1c7f8 ("ARM: mach-imx: > imx6ul: remove not optional ethernet refclock overwrite"). > > Clearing bits 13 and 17 of GPR1 is the POR values, so this change > does not affect existing boards in mainline. > > Tested on imx6sx-udoo-neo and imx6sx-sdb boards. > > Signed-off-by: Fabio Estevam <festevam@denx.de> Applied, thanks!
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 9ababf4ac210..3feb31ab556e 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -7,37 +7,15 @@ #include <linux/of_platform.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> -#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> #include <asm/mach/arch.h> #include "common.h" #include "cpuidle.h" -static void __init imx6sx_enet_clk_sel(void) -{ - struct regmap *gpr; - - gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr"); - if (!IS_ERR(gpr)) { - regmap_update_bits(gpr, IOMUXC_GPR1, - IMX6SX_GPR1_FEC_CLOCK_MUX_SEL_MASK, 0); - regmap_update_bits(gpr, IOMUXC_GPR1, - IMX6SX_GPR1_FEC_CLOCK_PAD_DIR_MASK, 0); - } else { - pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n"); - } -} - -static inline void imx6sx_enet_init(void) -{ - imx6sx_enet_clk_sel(); -} - static void __init imx6sx_init_machine(void) { of_platform_default_populate(NULL, NULL, NULL); - imx6sx_enet_init(); imx_anatop_init(); imx6sx_pm_init(); }