diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-09-22 10:51:51 -0700 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:10:10 +0100 |
| commit | 7711ceeea050bf9f45add3f1a7f78607b13c034c (patch) | |
| tree | a5d58952849716307d724088971ff5b25ae2826a /arch/arm/boot/dts/imx7-colibri.dtsi | |
| parent | e810f25131e6eed308b2b317ec01a16b1240ee9a (diff) | |
arm: dts: imx7: disable pull-up on multiplexed pins
The PWM<A> and PWM<D> 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 <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit b4413e4426977aa88e2a712cb549104e792859d8)
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
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 >; }; |