Unverified Commit 23516fba authored by Hans de Goede's avatar Hans de Goede Committed by Ilpo Järvinen
Browse files

platform/x86: int3472: Add new skl_int3472_fill_gpiod_lookup() helper 



Add a new skl_int3472_fill_gpiod_lookup() helper.

This is a preparation patch for removing usage of the deprecated
gpiod_toggle_active_low() and acpi_get_and_request_gpiod() functions.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20231004162317.163488-2-hdegoede@redhat.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 0bb80ecc

drivers/platform/x86/intel/int3472/discrete.c

+22 −10
Original line number Diff line number Diff line
@@ -52,21 +52,15 @@ static void skl_int3472_log_sensor_module_name(struct int3472_discrete_device *i 
	}

}



static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int3472,

static int skl_int3472_fill_gpiod_lookup(struct gpiod_lookup *table_entry,

					 struct acpi_resource_gpio *agpio,

					 const char *func, u32 polarity)

{

	char *path = agpio->resource_source.string_ptr;

	struct gpiod_lookup *table_entry;

	struct acpi_device *adev;

	acpi_handle handle;

	acpi_status status;



	if (int3472->n_sensor_gpios >= INT3472_MAX_SENSOR_GPIOS) {

		dev_warn(int3472->dev, "Too many GPIOs mapped\n");

		return -EINVAL;

	}



	status = acpi_get_handle(NULL, path, &handle);

	if (ACPI_FAILURE(status))

		return -EINVAL;
@@ -75,13 +69,31 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 
	if (!adev)

		return -ENODEV;



	table_entry = &int3472->gpios.table[int3472->n_sensor_gpios];

	table_entry->key = acpi_dev_name(adev);

	table_entry->chip_hwnum = agpio->pin_table[0];

	table_entry->con_id = func;

	table_entry->idx = 0;

	table_entry->flags = polarity;



	return 0;

}



static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int3472,

					  struct acpi_resource_gpio *agpio,

					  const char *func, u32 polarity)

{

	int ret;



	if (int3472->n_sensor_gpios >= INT3472_MAX_SENSOR_GPIOS) {

		dev_warn(int3472->dev, "Too many GPIOs mapped\n");

		return -EINVAL;

	}



	ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],

					    agpio, func, polarity);

	if (ret)

		return ret;



	int3472->n_sensor_gpios++;



	return 0;