From b4413e4426977aa88e2a712cb549104e792859d8 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 22 Sep 2016 10:51:51 -0700 Subject: arm: dts: imx7: disable pull-up on multiplexed pins The PWM and PWM have multiplexed pins which by default have a pull-up enabled. Take them into the same pinmux group as the PWM pin and disable pull-ups. This also makes sure that there is no conflicting usage of the same pin... Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- arch/arm/boot/dts/imx7-colibri.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 8af1835198a5..0a6be0a9f86f 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -546,6 +546,7 @@ pinctrl_pwm1: pwm1grp { fsl,pins = < MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x79 + MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21 0x4 >; }; @@ -564,6 +565,7 @@ pinctrl_pwm4: pwm4grp { fsl,pins = < MX7D_PAD_GPIO1_IO11__PWM4_OUT 0x79 + MX7D_PAD_ECSPI2_SCLK__GPIO4_IO20 0x4 >; }; -- cgit v1.2.3