From: Anson Huang Date: Thu, 11 Sep 2014 03:29:41 +0000 (+0800) Subject: ARM: dts: imx6: make gpt per clock can be from OSC X-Git-Tag: v3.18-rc1~119^2~20^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2b2244a3e7c3d537f436a3580999b3032628d17d;p=~emulex%2Finfiniband.git ARM: dts: imx6: make gpt per clock can be from OSC Original gpt per clk parent is from ipg_per clk which may be scaled when system enter low bus mode, as ipg clk will be lower in low bus mode, to keep system clk NOT drift, select gpt per clk parent from OSC which is at fixed freq always. On i.mx6qdl, add a osc_per clk source for i.mx6q TO > 1.0 and all i.MX6dl SoC. On i.mx6sx, just make gpt per clk from OSC. Signed-off-by: Anson Huang Signed-off-by: Shawn Guo --- diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 0de8806222c..9596ed5867e 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -407,8 +407,9 @@ reg = <0x02098000 0x4000>; interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_GPT_IPG>, - <&clks IMX6QDL_CLK_GPT_IPG_PER>; - clock-names = "ipg", "per"; + <&clks IMX6QDL_CLK_GPT_IPG_PER>, + <&clks IMX6QDL_CLK_GPT_3M>; + clock-names = "ipg", "per", "osc_per"; }; gpio1: gpio@0209c000 { diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index d137cacabba..888dd767a0b 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -421,7 +421,7 @@ reg = <0x02098000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_GPT_BUS>, - <&clks IMX6SX_CLK_GPT_SERIAL>; + <&clks IMX6SX_CLK_GPT_3M>; clock-names = "ipg", "per"; };