Merge "Revert "gpio: set up initial state from .get_direction()"" into msm-4.14 (df7ad356) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpio/gpiolib.c

+7 −24

Original line number	Diff line number	Diff line
		@@ -1224,31 +1224,14 @@ int gpiochip_add_data(struct gpio_chip chip, void data)
		struct gpio_desc *desc = &gdev->descs[i];

		desc->gdev = gdev;
		/*
		* REVISIT: most hardware initializes GPIOs as inputs
		* (often with pullups enabled) so power usage is
		* minimized. Linux code should set the gpio direction
		* first thing; but until it does, and in case
		* chip->get_direction is not set, we may expose the
		* wrong direction in sysfs.
		*/

		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.
		/* REVISIT: most hardware initializes GPIOs as inputs (often
		* with pullups enabled) so power usage is minimized. Linux
		* code should set the gpio direction first thing; but until
		* it does, and in case chip->get_direction is not set, we may
		* expose the wrong direction in sysfs.
		*/
		set_bit(FLAG_IS_OUT, &desc->flags);
		}
		desc->flags = !chip->direction_input ? (1 << FLAG_IS_OUT) : 0;
		}

		#ifdef CONFIG_PINCTRL