Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 13:34:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform/x86: int3472: Stop using gpiod_toggle_active_low()

Browse Source 
Use the new skl_int3472_gpiod_get_from_temp_lookup() helper to get
a gpio to pass to register_gpio_clock(), skl_int3472_register_regulator()
and skl_int3472_register_pled().

This removes all use of the deprecated gpiod_toggle_active_low() and
acpi_get_and_request_gpiod() functions.

Suggested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20231004162317.163488-4-hdegoede@redhat.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Hans de Goede 2023-10-04 18:23:15 +02:00 committed by Ilpo Järvinen
parent 5cad12851b
commit 53c5f7f6e7
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
4 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/platform/x86/intel/int3472/clk_and_regulator.c
View File

@ -162,9 +162,8 @@ out_free_init_name:
} }
int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472, int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472,
struct acpi_resource_gpio *agpio, u32 polarity) struct gpio_desc *gpio)
{ {
char *path = agpio->resource_source.string_ptr;
struct clk_init_data init = { struct clk_init_data init = {
.ops = &skl_int3472_clock_ops, .ops = &skl_int3472_clock_ops,
.flags = CLK_GET_RATE_NOCACHE, .flags = CLK_GET_RATE_NOCACHE,
@ -174,19 +173,7 @@ int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472,
if (int3472->clock.cl) if (int3472->clock.cl)
return -EBUSY; return -EBUSY;
int3472->clock.ena_gpio = acpi_get_and_request_gpiod(path, agpio->pin_table[0], int3472->clock.ena_gpio = gpio;
"int3472,clk-enable");
if (IS_ERR(int3472->clock.ena_gpio)) {
ret = PTR_ERR(int3472->clock.ena_gpio);
int3472->clock.ena_gpio = NULL;
return dev_err_probe(int3472->dev, ret, "getting clk-enable GPIO\n");
}
if (polarity == GPIO_ACTIVE_LOW)
gpiod_toggle_active_low(int3472->clock.ena_gpio);
/* Ensure the pin is in output mode and non-active state */
gpiod_direction_output(int3472->clock.ena_gpio, 0);
init.name = kasprintf(GFP_KERNEL, "%s-clk", init.name = kasprintf(GFP_KERNEL, "%s-clk",
acpi_dev_name(int3472->adev)); acpi_dev_name(int3472->adev));
@ -273,9 +260,8 @@ static const struct dmi_system_id skl_int3472_regulator_second_sensor[] = {
}; };
int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
struct acpi_resource_gpio *agpio) struct gpio_desc *gpio)
{ {
char *path = agpio->resource_source.string_ptr;
struct regulator_init_data init_data = { }; struct regulator_init_data init_data = { };
struct regulator_config cfg = { }; struct regulator_config cfg = { };
const char *second_sensor = NULL; const char *second_sensor = NULL;
@ -314,16 +300,7 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
int3472->regulator.supply_name, int3472->regulator.supply_name,
&int3472_gpio_regulator_ops); &int3472_gpio_regulator_ops);
int3472->regulator.gpio = acpi_get_and_request_gpiod(path, agpio->pin_table[0], int3472->regulator.gpio = gpio;
"int3472,regulator");
if (IS_ERR(int3472->regulator.gpio)) {
ret = PTR_ERR(int3472->regulator.gpio);
int3472->regulator.gpio = NULL;
return dev_err_probe(int3472->dev, ret, "getting regulator GPIO\n");
}
/* Ensure the pin is in output mode and non-active state */
gpiod_direction_output(int3472->regulator.gpio, 0);
cfg.dev = &int3472->adev->dev; cfg.dev = &int3472->adev->dev;
cfg.init_data = &init_data; cfg.init_data = &init_data;

7
drivers/platform/x86/intel/int3472/common.h
View File

@ -117,16 +117,15 @@ int skl_int3472_get_sensor_adev_and_name(struct device *dev,
const char **name_ret); const char **name_ret);
int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472, int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472,
struct acpi_resource_gpio *agpio, u32 polarity); struct gpio_desc *gpio);
int skl_int3472_register_dsm_clock(struct int3472_discrete_device *int3472); int skl_int3472_register_dsm_clock(struct int3472_discrete_device *int3472);
void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472); void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472);
int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
struct acpi_resource_gpio *agpio); struct gpio_desc *gpio);
void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472); void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472);
int skl_int3472_register_pled(struct int3472_discrete_device *int3472, int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gpio_desc *gpio);
struct acpi_resource_gpio *agpio, u32 polarity);
void skl_int3472_unregister_pled(struct int3472_discrete_device *int3472); void skl_int3472_unregister_pled(struct int3472_discrete_device *int3472);
#endif #endif

43
drivers/platform/x86/intel/int3472/discrete.c
View File

@ -194,6 +194,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
struct acpi_resource_gpio *agpio; struct acpi_resource_gpio *agpio;
u8 active_value, pin, type; u8 active_value, pin, type;
union acpi_object *obj; union acpi_object *obj;
struct gpio_desc *gpio;
const char *err_msg; const char *err_msg;
const char *func; const char *func;
u32 polarity; u32 polarity;
@ -244,22 +245,38 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
break; break;
case INT3472_GPIO_TYPE_CLK_ENABLE: case INT3472_GPIO_TYPE_CLK_ENABLE:
ret = skl_int3472_register_gpio_clock(int3472, agpio, polarity);
if (ret)
err_msg = "Failed to register clock\n";
break;
case INT3472_GPIO_TYPE_PRIVACY_LED: case INT3472_GPIO_TYPE_PRIVACY_LED:
ret = skl_int3472_register_pled(int3472, agpio, polarity);
if (ret)
err_msg = "Failed to register LED\n";
break;
case INT3472_GPIO_TYPE_POWER_ENABLE: case INT3472_GPIO_TYPE_POWER_ENABLE:
ret = skl_int3472_register_regulator(int3472, agpio); gpio = skl_int3472_gpiod_get_from_temp_lookup(int3472, agpio, func, polarity);
if (ret) if (IS_ERR(gpio)) {
err_msg = "Failed to map regulator to sensor\n"; ret = PTR_ERR(gpio);
err_msg = "Failed to get GPIO\n";
break;
}
switch (type) {
case INT3472_GPIO_TYPE_CLK_ENABLE:
ret = skl_int3472_register_gpio_clock(int3472, gpio);
if (ret)
err_msg = "Failed to register clock\n";
break;
case INT3472_GPIO_TYPE_PRIVACY_LED:
ret = skl_int3472_register_pled(int3472, gpio);
if (ret)
err_msg = "Failed to register LED\n";
break;
case INT3472_GPIO_TYPE_POWER_ENABLE:
ret = skl_int3472_register_regulator(int3472, gpio);
if (ret)
err_msg = "Failed to map regulator to sensor\n";
break;
default: /* Never reached */
ret = -EINVAL;
break;
}
break; break;
default: default:
dev_warn(int3472->dev, dev_warn(int3472->dev,

17
drivers/platform/x86/intel/int3472/led.c
View File

@ -16,26 +16,15 @@ static int int3472_pled_set(struct led_classdev *led_cdev,
return 0; return 0;
} }
int skl_int3472_register_pled(struct int3472_discrete_device *int3472, int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gpio_desc *gpio)
struct acpi_resource_gpio *agpio, u32 polarity)
{ {
char *p, *path = agpio->resource_source.string_ptr; char *p;
int ret; int ret;
if (int3472->pled.classdev.dev) if (int3472->pled.classdev.dev)
return -EBUSY; return -EBUSY;
int3472->pled.gpio = acpi_get_and_request_gpiod(path, agpio->pin_table[0], int3472->pled.gpio = gpio;
"int3472,privacy-led");
if (IS_ERR(int3472->pled.gpio))
return dev_err_probe(int3472->dev, PTR_ERR(int3472->pled.gpio),
"getting privacy LED GPIO\n");
if (polarity == GPIO_ACTIVE_LOW)
gpiod_toggle_active_low(int3472->pled.gpio);
/* Ensure the pin is in output mode and non-active state */
gpiod_direction_output(int3472->pled.gpio, 0);
/* Generate the name, replacing the ':' in the ACPI devname with '_' */ /* Generate the name, replacing the ':' in the ACPI devname with '_' */
snprintf(int3472->pled.name, sizeof(int3472->pled.name), snprintf(int3472->pled.name, sizeof(int3472->pled.name),