diff options
author | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /arch/arm/boot/dts/imx6qdl-apalis.dtsi | |
parent | ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup (diff) | |
parent | ARM: OMAP1: ams-delta: Fix possible use of uninitialized field (diff) | |
download | linux-91e43395820baad80248987608216c35da9df65b.tar.xz linux-91e43395820baad80248987608216c35da9df65b.zip |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-apalis.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 05f07ea3e8c8..3dc99dd8dde1 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -482,10 +482,6 @@ }; &iomuxc { - /* pins used on module */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reset_moci>; - pinctrl_apalis_gpio1: gpio2io04grp { fsl,pins = < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 |