platform/x86: int3472: Parameterize LED con_id in registration

Add a con_id parameter to skl_int3472_register_led() to allow callers
to specify both the LED name suffix and lookup con_id instead of
hardcoding "privacy". This prepares for registering additional LED
types with different names.

While at it, rename the privacy LED's GPIO con_id from "privacy-led"
to "privacy" in int3472_get_con_id_and_polarity() and pass it
directly to skl_int3472_register_led(), reducing churn when adding
new LED types.

No functional change.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: Marco Nenciarini <mnencia@kcore.it>
Link: https://patch.msgid.link/20260401203638.1601661-4-mnencia@kcore.it
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index b03f61dab25fce8fd921995a0236286d45ef99a4..637e3821b4968609bc28819de9ca48b9795685d4 100644 (file)
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -212,7 +212,7 @@ static void int3472_get_con_id_and_polarity(struct int3472_discrete_device *int3
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        case INT3472_GPIO_TYPE_PRIVACY_LED:
-               *con_id = "privacy-led";
+               *con_id = "privacy";
                *gpio_flags = GPIO_ACTIVE_HIGH;
                break;
        case INT3472_GPIO_TYPE_HOTPLUG_DETECT:
@@ -354,7 +354,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 
                        break;
                case INT3472_GPIO_TYPE_PRIVACY_LED:
-                       ret = skl_int3472_register_led(int3472, gpio);
+                       ret = skl_int3472_register_led(int3472, gpio, con_id);
                        if (ret)
                                err_msg = "Failed to register LED\n";
 

diff --git a/drivers/platform/x86/intel/int3472/led.c b/drivers/platform/x86/intel/int3472/led.c
index fe412cb938cfd673d10568fbcd6ff7df49f4bda4..22d0d6c5e6ce6521c5bb23324075aa345146e80c 100644 (file)
--- a/drivers/platform/x86/intel/int3472/led.c
+++ b/drivers/platform/x86/intel/int3472/led.c
@@ -14,7 +14,8 @@ static int int3472_led_set(struct led_classdev *led_cdev, enum led_brightness br
        return 0;
 }
 
-int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio)
+int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio,
+                            const char *con_id)
 {
        struct int3472_led *led = &int3472->led;
        char *p;
@@ -27,7 +28,7 @@ int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpi
 
        /* Generate the name, replacing the ':' in the ACPI devname with '_' */
        snprintf(led->name, sizeof(led->name),
-                "%s::privacy_led", acpi_dev_name(int3472->sensor));
+                "%s::%s_led", acpi_dev_name(int3472->sensor), con_id);
        p = strchr(led->name, ':');
        if (p)
                *p = '_';
@@ -42,7 +43,7 @@ int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpi
 
        led->lookup.provider = led->name;
        led->lookup.dev_id = int3472->sensor_name;
-       led->lookup.con_id = "privacy";
+       led->lookup.con_id = con_id;
        led_add_lookup(&led->lookup);
 
        return 0;

diff --git a/include/linux/platform_data/x86/int3472.h b/include/linux/platform_data/x86/int3472.h
index 39a1938d77e1722f8541b67736c9668586641e3e..ebf4d063762440cc5e5b20c6dba99410da51f49b 100644 (file)
--- a/include/linux/platform_data/x86/int3472.h
+++ b/include/linux/platform_data/x86/int3472.h
@@ -161,7 +161,8 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
                                   const char *second_sensor);
 void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472);
 
-int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio);
+int skl_int3472_register_led(struct int3472_discrete_device *int3472, struct gpio_desc *gpio,
+                            const char *con_id);
 void skl_int3472_unregister_led(struct int3472_discrete_device *int3472);
 
 #endif