Commit 2eca25af authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpio: acpi: Factor out acpi_gpio_to_gpiod_flags() helper 



The helper function acpi_gpio_to_gpiod_flags() will be used later to configure
pin properly whenever it's requested.

While here, introduce a checking error code returned by gpiod_configure_flags()
and bail out if it's not okay.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ed7fcf1e

drivers/gpio/gpiolib-acpi.c

+36 −25
Original line number Diff line number Diff line
@@ -423,6 +423,31 @@ static bool acpi_get_driver_gpio_data(struct acpi_device *adev, 
	return false;

}



static enum gpiod_flags

acpi_gpio_to_gpiod_flags(const struct acpi_resource_gpio *agpio)

{

	bool pull_up = agpio->pin_config == ACPI_PIN_CONFIG_PULLUP;



	switch (agpio->io_restriction) {

	case ACPI_IO_RESTRICT_INPUT:

		return GPIOD_IN;

	case ACPI_IO_RESTRICT_OUTPUT:

		/*

		 * ACPI GPIO resources don't contain an initial value for the

		 * GPIO. Therefore we deduce that value from the pull field

		 * instead. If the pin is pulled up we assume default to be

		 * high, otherwise low.

		 */

		return pull_up ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;

	default:

		/*

		 * Assume that the BIOS has configured the direction and pull

		 * accordingly.

		 */

		return GPIOD_ASIS;

	}

}



struct acpi_gpio_lookup {

	struct acpi_gpio_info info;

	int index;
@@ -740,7 +765,6 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, 
	struct acpi_resource *ares;

	int pin_index = (int)address;

	acpi_status status;

	bool pull_up;

	int length;

	int i;
@@ -755,7 +779,6 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, 
	}



	agpio = &ares->data.gpio;

	pull_up = agpio->pin_config == ACPI_PIN_CONFIG_PULLUP;



	if (WARN_ON(agpio->io_restriction == ACPI_IO_RESTRICT_INPUT &&

	    function == ACPI_WRITE)) {
@@ -806,35 +829,23 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, 
		}



		if (!found) {

			desc = gpiochip_request_own_desc(chip, pin,

							 "ACPI:OpRegion");

			enum gpiod_flags flags = acpi_gpio_to_gpiod_flags(agpio);

			const char *label = "ACPI:OpRegion";

			int err;



			desc = gpiochip_request_own_desc(chip, pin, label);

			if (IS_ERR(desc)) {

				status = AE_ERROR;

				mutex_unlock(&achip->conn_lock);

				goto out;

			}



			switch (agpio->io_restriction) {

			case ACPI_IO_RESTRICT_INPUT:

				gpiod_direction_input(desc);

				break;

			case ACPI_IO_RESTRICT_OUTPUT:

				/*

				 * ACPI GPIO resources don't contain an

				 * initial value for the GPIO. Therefore we

				 * deduce that value from the pull field

				 * instead. If the pin is pulled up we

				 * assume default to be high, otherwise

				 * low.

				 */

				gpiod_direction_output(desc, pull_up);

				break;

			default:

				/*

				 * Assume that the BIOS has configured the

				 * direction and pull accordingly.

				 */

				break;

			err = gpiod_configure_flags(desc, label, 0, flags);

			if (err < 0) {

				status = AE_NOT_CONFIGURED;

				gpiochip_free_own_desc(desc);

				mutex_unlock(&achip->conn_lock);

				goto out;

			}



			conn = kzalloc(sizeof(*conn), GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE