From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 06:12:14 +0000 (+1000)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c2d31cb95a3fab2f1785d8d65a7597b960142ce5;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'pinctrl/for-next'

# Conflicts:
#	include/linux/pinctrl/pinconf-generic.h
---

c2d31cb95a3fab2f1785d8d65a7597b960142ce5
diff --cc include/linux/pinctrl/pinconf-generic.h
index 5a96602a33160,98ed5959ca9ac..eee0e3948537f
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@@ -81,6 -81,10 +81,10 @@@ struct pinctrl_map
   *	passed in the argument on a custom form, else just use argument 1
   *	to indicate low power mode, argument 0 turns low power mode off.
   * @PIN_CONFIG_MODE_PWM: this will configure the pin for PWM
+  * @PIN_CONFIG_OUTPUT: this will configure the pin as an output and drive a
+  * 	value on the line. Use argument 1 to indicate high level, argument 0 to
 - *	indicate low level. (Please see Documentation/driver-api/pinctl.rst,
++ *	indicate low level. (Please see Documentation/driver-api/pin-control.rst,
+  *	section "GPIO mode pitfalls" for a discussion around this parameter.)
   * @PIN_CONFIG_OUTPUT_ENABLE: this will enable the pin's output mode
   * 	without driving a value there. For most platforms this reduces to
   * 	enable the output buffers and then let the pin controller current