summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6sll.dtsi
diff options
context:
space:
mode:
authorBai Ping <ping.bai@nxp.com>2017-01-20 17:41:25 +0800
committerRobby Cai <robby.cai@nxp.com>2017-04-19 19:13:58 +0800
commit40fd9e0e1344a823b7993e6cb438ac9b13ef2694 (patch)
tree1bdc5a26e4c751d7c1008963cca64491f0ce9925 /arch/arm/boot/dts/imx6sll.dtsi
parent03d8ca23239d9662e3244e7c07d28825ad3d66c3 (diff)
MLK-13801-02 ARM: dts: Correct the gpt timer clock source on imx6ul/ull/sll
The GPT timer counter clock should be sourced from GPT_3M clock to avoid counter clock frequency changed due to system bus clock changes. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 3f85257a0ab3471f2574d5a34a311d4ef4483f7d)
Diffstat (limited to 'arch/arm/boot/dts/imx6sll.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6sll.dtsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 89146a19ebfa..5b9f8423aeea 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -1,5 +1,6 @@
/*
* Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -395,8 +396,8 @@
reg = <0x02098000 0x4000>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SLL_CLK_GPT_BUS>,
- <&clks IMX6SLL_CLK_GPT_SERIAL>;
- clock-names = "ipg", "per";
+ <&clks IMX6SLL_CLK_GPT_3M>;
+ clock-names = "ipg", "osc_per";
};
gpio1: gpio@0209c000 {