diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 23:59:33 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-17 23:59:33 +0300 |
| commit | 8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d (patch) | |
| tree | 18cdadced0870584ceffa02eed47f4c86da8263c /Documentation/driver-api/gpio | |
| parent | 760a160e8b899f5ebcab99da17feebbe40ec42f1 (diff) | |
| parent | 68b7587baabfa42ca5625b709691358fee51b9d8 (diff) | |
| download | linux-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.tar.xz | |
Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel
gpio updates for v5.1
- support for a new variant of pca953x
- documentation fix from Wolfram
- some tegra186 name changes
- two minor fixes for madera and altera-a10sr
Diffstat (limited to 'Documentation/driver-api/gpio')
| -rw-r--r-- | Documentation/driver-api/gpio/driver.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/driver-api/gpio/driver.rst b/Documentation/driver-api/gpio/driver.rst index a92d8837b62b..3043167fc557 100644 --- a/Documentation/driver-api/gpio/driver.rst +++ b/Documentation/driver-api/gpio/driver.rst @@ -135,7 +135,7 @@ This configuration is normally used as a way to achieve one of two things: - inverse wire-OR on an I/O line, for example a GPIO line, making it possible for any driving stage on the line to drive it low even if any other output to the same line is simultaneously driving it high. A special case of this - is driving the SCL and SCA lines of an I2C bus, which is by definition a + is driving the SCL and SDA lines of an I2C bus, which is by definition a wire-OR bus. Both usecases require that the line be equipped with a pull-up resistor. This |