diff options
author | Lothar Waßmann <LW@KARO-electronics.de> | 2016-03-08 09:04:01 +0100 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2016-04-13 11:44:59 +0200 |
commit | c4aca663aebf2d1de3e7b6ab15680bf67ad0d678 (patch) | |
tree | 3205d79676d478cd3de56df1491ffe7ae4ad1085 /arch/arm/boot/dts/imx6q-tx6q-1110.dts | |
parent | ARM: dts: imx6-tx6: disable the spi node by default (diff) | |
download | linux-c4aca663aebf2d1de3e7b6ab15680bf67ad0d678.tar.xz linux-c4aca663aebf2d1de3e7b6ab15680bf67ad0d678.zip |
ARM: dts: imx6-tx6: remove container node around pinctrl nodes
Remove the function node around the pinctrl nodes that was obsoleted
by commit 5fcdf6a7ed95 ("pinctrl: imx: Allow parsing DT without
function nodes"), we can save this container node.
Also move the iomux node to the bottom of the file to improve
readability of the file.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-tx6q-1110.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-tx6q-1110.dts | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts index 45ceee77a23e..0433e220a931 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts @@ -111,16 +111,6 @@ }; }; -&iomuxc { - imx6q-tx6q-1110 { - pinctrl_eeti: eetigrp { - fsl,pins = < - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ - >; - }; - }; -}; - &kpp { status = "disabled"; /* pad conflict with backlight1 PWM */ }; @@ -182,3 +172,11 @@ &sata { status = "okay"; }; + +&iomuxc { + pinctrl_eeti: eetigrp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ + >; + }; +}; |