diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2013-06-26 09:08:49 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-08-16 01:11:21 -0400 |
commit | 6d6fc5012a7df26e1209b47659a43d47d3709497 (patch) | |
tree | 0ce19179165be67612e18131865ea8537fcccfd7 /arch/arm/mach-imx | |
parent | 17c4b89df523ea375e1ec4f02df7ab94c9c89d1b (diff) |
ARM i.MX6Q: Use ENET_CLK_SEL defines in imx6q_1588_init
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index db1db78b28fc..59218418fde3 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/regmap.h> | 31 | #include <linux/regmap.h> |
32 | #include <linux/micrel_phy.h> | 32 | #include <linux/micrel_phy.h> |
33 | #include <linux/mfd/syscon.h> | 33 | #include <linux/mfd/syscon.h> |
34 | #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> | ||
34 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
35 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
36 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
@@ -242,7 +243,9 @@ static void __init imx6q_1588_init(void) | |||
242 | 243 | ||
243 | gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr"); | 244 | gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr"); |
244 | if (!IS_ERR(gpr)) | 245 | if (!IS_ERR(gpr)) |
245 | regmap_update_bits(gpr, 0x4, 1 << 21, 1 << 21); | 246 | regmap_update_bits(gpr, IOMUXC_GPR1, |
247 | IMX6Q_GPR1_ENET_CLK_SEL_MASK, | ||
248 | IMX6Q_GPR1_ENET_CLK_SEL_ANATOP); | ||
246 | else | 249 | else |
247 | pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n"); | 250 | pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n"); |
248 | 251 | ||