Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 15:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "gpio: set up initial state from .get_direction()"

Browse Source 
This reverts commit 72d3200061776264941be1b5a9bb8e926b3b30a5.

We cannot blindly query the direction of all GPIOs when the pins are
first registered.  The get_direction callback normally triggers a
read/write to hardware, but we shouldn't be touching the hardware for
an individual GPIO until after it's been properly claimed.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Timur Tabi 2017-12-20 13:10:31 -06:00 committed by Linus Walleij
parent caa92ee84b
commit 1ca2a92b2a
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpio/gpiolib.c
View File

@ -1217,31 +1217,14 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
struct gpio_desc *desc = &gdev->descs[i]; struct gpio_desc *desc = &gdev->descs[i];
desc->gdev = gdev; desc->gdev = gdev;
/*
* REVISIT: most hardware initializes GPIOs as inputs /* REVISIT: most hardware initializes GPIOs as inputs (often
* (often with pullups enabled) so power usage is * with pullups enabled) so power usage is minimized. Linux
* minimized. Linux code should set the gpio direction * code should set the gpio direction first thing; but until
* first thing; but until it does, and in case * it does, and in case chip->get_direction is not set, we may
* chip->get_direction is not set, we may expose the * expose the wrong direction in sysfs.
* wrong direction in sysfs.
*/ */
desc->flags = !chip->direction_input ? (1 << FLAG_IS_OUT) : 0;
if (chip->get_direction) {
/*
* If we have .get_direction, set up the initial
* direction flag from the hardware.
*/
int dir = chip->get_direction(chip, i);
if (!dir)
set_bit(FLAG_IS_OUT, &desc->flags);
} else if (!chip->direction_input) {
/*
* If the chip lacks the .direction_input callback
* we logically assume all lines are outputs.
*/
set_bit(FLAG_IS_OUT, &desc->flags);
}
} }
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL