summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-imx6q.c
diff options
context:
space:
mode:
authorPhilipp Zabel2013-06-26 15:08:49 +0200
committerShawn Guo2013-08-16 07:11:21 +0200
commit6d6fc5012a7df26e1209b47659a43d47d3709497 (patch)
tree0ce19179165be67612e18131865ea8537fcccfd7 /arch/arm/mach-imx/mach-imx6q.c
parentARM: imx_v6_v7_defconfig: Select CONFIG_NOP_USB_XCEIV by default (diff)
downloadkernel-qcow2-linux-6d6fc5012a7df26e1209b47659a43d47d3709497.tar.gz
kernel-qcow2-linux-6d6fc5012a7df26e1209b47659a43d47d3709497.tar.xz
kernel-qcow2-linux-6d6fc5012a7df26e1209b47659a43d47d3709497.zip
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/mach-imx6q.c')
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c5
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 @@
#include <linux/regmap.h>
#include <linux/micrel_phy.h>
#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -242,7 +243,9 @@ static void __init imx6q_1588_init(void)
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
if (!IS_ERR(gpr))
- regmap_update_bits(gpr, 0x4, 1 << 21, 1 << 21);
+ regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6Q_GPR1_ENET_CLK_SEL_MASK,
+ IMX6Q_GPR1_ENET_CLK_SEL_ANATOP);
else
pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");