Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6ull-phytec-segin.dtsi

diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi
index c1595fc..e287a04 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi
+++ b/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi
@@ -14,7 +14,6 @@
 &iomuxc {
        /delete-node/ flexcan1engrp;
        /delete-node/ rtcintgrp;
-       /delete-node/ stmpegrp;
 };
 
 &iomuxc_snvs {
@@ -29,10 +28,4 @@
                        MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01     0x17059
                >;
        };
-
-       pinctrl_stmpe: stmpegrp {
-               fsl,pins = <
-                       MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03     0x17059
-               >;
-       };
 };