Skip to content

Commit 9c26327

Browse files
Fabio EstevamShawn Guo
authored andcommitted
ARM: mach-imx: imx6sx: Remove Ethernet refclock setting
The Ethernet refclock configuration is board specific and should not be harcoded in machine code. Remove it to align with the imx6ul commit e87f3be ("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> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 8400291 commit 9c26327

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

arch/arm/mach-imx/mach-imx6sx.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,15 @@
77
#include <linux/of_platform.h>
88
#include <linux/regmap.h>
99
#include <linux/mfd/syscon.h>
10-
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
1110
#include <asm/mach/arch.h>
1211

1312
#include "common.h"
1413
#include "cpuidle.h"
1514

16-
static void __init imx6sx_enet_clk_sel(void)
17-
{
18-
struct regmap *gpr;
19-
20-
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");
21-
if (!IS_ERR(gpr)) {
22-
regmap_update_bits(gpr, IOMUXC_GPR1,
23-
IMX6SX_GPR1_FEC_CLOCK_MUX_SEL_MASK, 0);
24-
regmap_update_bits(gpr, IOMUXC_GPR1,
25-
IMX6SX_GPR1_FEC_CLOCK_PAD_DIR_MASK, 0);
26-
} else {
27-
pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");
28-
}
29-
}
30-
31-
static inline void imx6sx_enet_init(void)
32-
{
33-
imx6sx_enet_clk_sel();
34-
}
35-
3615
static void __init imx6sx_init_machine(void)
3716
{
3817
of_platform_default_populate(NULL, NULL, NULL);
3918

40-
imx6sx_enet_init();
4119
imx_anatop_init();
4220
imx6sx_pm_init();
4321
}

0 commit comments

Comments
 (0)