Skip to content

Commit 4fe36f8

Browse files
Anson-Huanggregkh
authored andcommitted
ARM: dts: imx: make gpt node name generic
[ Upstream commit 7c48b08 ] Node name should be generic, use "timer" instead of "gpt" for gpt node. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Stable-dep-of: 397caf6 ("ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 69b669c commit 4fe36f8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

arch/arm/boot/dts/imx6qdl.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@
578578
status = "disabled";
579579
};
580580

581-
gpt: gpt@2098000 {
581+
gpt: timer@2098000 {
582582
compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
583583
reg = <0x02098000 0x4000>;
584584
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sl.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
clock-names = "ipg", "per";
387387
};
388388

389-
gpt: gpt@2098000 {
389+
gpt: timer@2098000 {
390390
compatible = "fsl,imx6sl-gpt";
391391
reg = <0x02098000 0x4000>;
392392
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@
475475
status = "disabled";
476476
};
477477

478-
gpt: gpt@2098000 {
478+
gpt: timer@2098000 {
479479
compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
480480
reg = <0x02098000 0x4000>;
481481
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6ul.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
status = "disabled";
434434
};
435435

436-
gpt1: gpt@2098000 {
436+
gpt1: timer@2098000 {
437437
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
438438
reg = <0x02098000 0x4000>;
439439
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -707,7 +707,7 @@
707707
reg = <0x020e4000 0x4000>;
708708
};
709709

710-
gpt2: gpt@20e8000 {
710+
gpt2: timer@20e8000 {
711711
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
712712
reg = <0x020e8000 0x4000>;
713713
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx7s.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@
446446
fsl,input-sel = <&iomuxc>;
447447
};
448448

449-
gpt1: gpt@302d0000 {
449+
gpt1: timer@302d0000 {
450450
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
451451
reg = <0x302d0000 0x10000>;
452452
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -455,7 +455,7 @@
455455
clock-names = "ipg", "per";
456456
};
457457

458-
gpt2: gpt@302e0000 {
458+
gpt2: timer@302e0000 {
459459
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
460460
reg = <0x302e0000 0x10000>;
461461
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -465,7 +465,7 @@
465465
status = "disabled";
466466
};
467467

468-
gpt3: gpt@302f0000 {
468+
gpt3: timer@302f0000 {
469469
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
470470
reg = <0x302f0000 0x10000>;
471471
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -475,7 +475,7 @@
475475
status = "disabled";
476476
};
477477

478-
gpt4: gpt@30300000 {
478+
gpt4: timer@30300000 {
479479
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
480480
reg = <0x30300000 0x10000>;
481481
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)