]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.19.29/arm-dts-imx6sx-correct-backward-compatible-of-gpt.patch
fixes for 4.19
[thirdparty/kernel/stable-queue.git] / releases / 4.19.29 / arm-dts-imx6sx-correct-backward-compatible-of-gpt.patch
1 From 9b7f1020f43ef531f4148f719eadb990e20593ea Mon Sep 17 00:00:00 2001
2 From: Anson Huang <anson.huang@nxp.com>
3 Date: Sat, 29 Dec 2018 10:01:18 +0000
4 Subject: ARM: dts: imx6sx: correct backward compatible of gpt
5
6 [ Upstream commit ba0f4560526ba19300c07ed5a3c1df7592815dc6 ]
7
8 i.MX6SX has same GPT type as i.MX6DL, in GPT driver, it uses
9 below TIMER_OF_DECLARE, so the backward compatible should be
10 "fsl,imx6dl-gpt", correct it.
11
12 TIMER_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt);
13
14 Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
15 Signed-off-by: Shawn Guo <shawnguo@kernel.org>
16 Signed-off-by: Sasha Levin <sashal@kernel.org>
17 ---
18 arch/arm/boot/dts/imx6sx.dtsi | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21 diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
22 index 844caa39364f..50083cecc6c9 100644
23 --- a/arch/arm/boot/dts/imx6sx.dtsi
24 +++ b/arch/arm/boot/dts/imx6sx.dtsi
25 @@ -462,7 +462,7 @@
26 };
27
28 gpt: gpt@2098000 {
29 - compatible = "fsl,imx6sx-gpt", "fsl,imx31-gpt";
30 + compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
31 reg = <0x02098000 0x4000>;
32 interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
33 clocks = <&clks IMX6SX_CLK_GPT_BUS>,
34 --
35 2.19.1
36