summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2016-01-20 11:08:55 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-29 09:17:38 +0100
commit302e01b266c56e3faac2e19fe5fb8e43abf5bb94 (patch)
tree07736a47d029be07829baa358d0ec811b263a8d7 /arch
parentARM: dts: imx51: remove bogus pin definition (diff)
downloadlinux-302e01b266c56e3faac2e19fe5fb8e43abf5bb94.tar.xz
linux-302e01b266c56e3faac2e19fe5fb8e43abf5bb94.zip
ARM: dts: imx6ul: move tsc node to appropriate place in the DTB
Move the tsc node to keep the nodes sorted in ascending order by unit address. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6ul.dtsi22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 99b646506fc9..7e27d76a2d5d 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -236,6 +236,17 @@
};
};
+ tsc: tsc@02040000 {
+ compatible = "fsl,imx6ul-tsc";
+ reg = <0x02040000 0x4000>, <0x0219c000 0x4000>;
+ interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX6UL_CLK_IPG>,
+ <&clks IMX6UL_CLK_ADC2>;
+ clock-names = "tsc", "adc";
+ status = "disabled";
+ };
+
gpt1: gpt@02098000 {
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
reg = <0x02098000 0x4000>;
@@ -590,17 +601,6 @@
status = "disabled";
};
- tsc: tsc@02040000 {
- compatible = "fsl,imx6ul-tsc";
- reg = <0x02040000 0x4000>, <0x0219c000 0x4000>;
- interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX6UL_CLK_IPG>,
- <&clks IMX6UL_CLK_ADC2>;
- clock-names = "tsc", "adc";
- status = "disabled";
- };
-
usdhc1: usdhc@02190000 {
compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc";
reg = <0x02190000 0x4000>;