diff options
| author | Linus Torvalds | 2022-04-01 10:26:09 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-04-01 10:26:09 -0700 |
| commit | 26803bac2b70a7314f19d56c588cf7d55e4ddc3e (patch) | |
| tree | 8324a9a55217e3301016b10604ef799b55a96cd2 /drivers/gpio | |
| parent | aa240ee7883487201d0c6cc537ec1c4cd6cb2a9e (diff) | |
| parent | 24f71ae5447e661813228677d343208d624fc141 (diff) | |
Merge tag 'gpio-fixes-for-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski:
- grammar and formatting fixes in comments for gpio-ts4900
- correct links in gpio-ts5500
- fix a warning in doc generation for the core GPIO documentation
* tag 'gpio-fixes-for-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
gpio: ts5500: Fix Links to Technologic Systems web resources
gpio: Properly document parent data union
gpio: ts4900: Fix comment formatting and grammar
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-ts4900.c | 12 | ||||
| -rw-r--r-- | drivers/gpio/gpio-ts5500.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c index 69854fd2382a..416725c26e94 100644 --- a/drivers/gpio/gpio-ts4900.c +++ b/drivers/gpio/gpio-ts4900.c @@ -47,8 +47,9 @@ static int ts4900_gpio_direction_input(struct gpio_chip *chip, { struct ts4900_gpio_priv *priv = gpiochip_get_data(chip); - /* Only clear the OE bit here, requires a RMW. Prevents potential issue - * with OE and data getting to the physical pin at different times. + /* + * Only clear the OE bit here, requires a RMW. Prevents a potential issue + * with OE and DAT getting to the physical pin at different times. */ return regmap_update_bits(priv->regmap, offset, TS4900_GPIO_OE, 0); } @@ -60,9 +61,10 @@ static int ts4900_gpio_direction_output(struct gpio_chip *chip, unsigned int reg; int ret; - /* If changing from an input to an output, we need to first set the - * proper data bit to what is requested and then set OE bit. This - * prevents a glitch that can occur on the IO line + /* + * If changing from an input to an output, we need to first set the + * GPIO's DAT bit to what is requested and then set the OE bit. This + * prevents a glitch that can occur on the IO line. */ regmap_read(priv->regmap, offset, ®); if (!(reg & TS4900_GPIO_OE)) { diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c index b159e92a3612..8e03614c7a24 100644 --- a/drivers/gpio/gpio-ts5500.c +++ b/drivers/gpio/gpio-ts5500.c @@ -11,11 +11,11 @@ * Actually, the following platforms have DIO support: * * TS-5500: - * Documentation: http://wiki.embeddedarm.com/wiki/TS-5500 + * Documentation: https://docs.embeddedts.com/TS-5500 * Blocks: DIO1, DIO2 and LCD port. * * TS-5600: - * Documentation: http://wiki.embeddedarm.com/wiki/TS-5600 + * Documentation: https://docs.embeddedts.com/TS-5600 * Blocks: LCD port (identical to TS-5500 LCD). */ |