Commit 9b1785a2 authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: int3472/discrete: Refactor GPIO to sensor mapping 



Add a helper function to map the type returned by the _DSM
method to a function name + the default polarity for that function.

And fold the INT3472_GPIO_TYPE_RESET and INT3472_GPIO_TYPE_POWERDOWN
cases into a single generic case.

This is a preparation patch for further GPIO mapping changes.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Link: https://lore.kernel.org/r/20230127203729.10205-3-hdegoede@redhat.com
parent b6e10ff6

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

+36 −9
Original line number Diff line number Diff line
@@ -188,6 +188,36 @@ static int skl_int3472_map_gpio_to_clk(struct int3472_discrete_device *int3472, 
	return 0;

}



static void int3472_get_func_and_polarity(u8 type, const char **func, u32 *polarity)

{

	switch (type) {

	case INT3472_GPIO_TYPE_RESET:

		*func = "reset";

		*polarity = GPIO_ACTIVE_LOW;

		break;

	case INT3472_GPIO_TYPE_POWERDOWN:

		*func = "powerdown";

		*polarity = GPIO_ACTIVE_LOW;

		break;

	case INT3472_GPIO_TYPE_CLK_ENABLE:

		*func = "clk-enable";

		*polarity = GPIO_ACTIVE_HIGH;

		break;

	case INT3472_GPIO_TYPE_PRIVACY_LED:

		*func = "privacy-led";

		*polarity = GPIO_ACTIVE_HIGH;

		break;

	case INT3472_GPIO_TYPE_POWER_ENABLE:

		*func = "power-enable";

		*polarity = GPIO_ACTIVE_HIGH;

		break;

	default:

		*func = "unknown";

		*polarity = GPIO_ACTIVE_HIGH;

		break;

	}

}



/**

 * skl_int3472_handle_gpio_resources: Map PMIC resources to consuming sensor

 * @ares: A pointer to a &struct acpi_resource
@@ -227,6 +257,8 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, 
	struct acpi_resource_gpio *agpio;

	union acpi_object *obj;

	const char *err_msg;

	const char *func;

	u32 polarity;

	int ret;

	u8 type;
@@ -250,19 +282,14 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares, 


	type = obj->integer.value & 0xff;



	int3472_get_func_and_polarity(type, &func, &polarity);



	switch (type) {

	case INT3472_GPIO_TYPE_RESET:

		ret = skl_int3472_map_gpio_to_sensor(int3472, agpio, "reset",

						     GPIO_ACTIVE_LOW);

		if (ret)

			err_msg = "Failed to map reset pin to sensor\n";



		break;

	case INT3472_GPIO_TYPE_POWERDOWN:

		ret = skl_int3472_map_gpio_to_sensor(int3472, agpio, "powerdown",

						     GPIO_ACTIVE_LOW);

		ret = skl_int3472_map_gpio_to_sensor(int3472, agpio, func, polarity);

		if (ret)

			err_msg = "Failed to map powerdown pin to sensor\n";

			err_msg = "Failed to map GPIO pin to sensor\n";



		break;

	case INT3472_GPIO_TYPE_CLK_ENABLE: