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>

diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 17bb6de..675bac0 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 2f8a934..1b8902d 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright 2015-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
@@ -514,8 +515,8 @@
                                reg = <0x02098000 0x4000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6UL_CLK_GPT1_BUS>,
-                                        <&clks IMX6UL_CLK_GPT1_SERIAL>;
-                               clock-names = "ipg", "per";
+                                        <&clks IMX6UL_CLK_GPT_3M>;
+                               clock-names = "ipg", "osc_per";
                        };
 
                        gpio1: gpio@0209c000 {

diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index c0ec59b..2f43d31 100644 (file)
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright 2015-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
@@ -496,8 +497,8 @@
                                reg = <0x02098000 0x4000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6UL_CLK_GPT1_BUS>,
-                                        <&clks IMX6UL_CLK_GPT1_SERIAL>;
-                               clock-names = "ipg", "per";
+                                        <&clks IMX6UL_CLK_GPT_3M>;
+                               clock-names = "ipg", "osc_per";
                        };
 
                        gpio1: gpio@0209c000 {