diff mbox series

[v2,4/4] platform: x86: int3472: Register a LED lookup table entry for the privacy LED

Message ID 20230310095635.813262-5-hpa@redhat.com
State New
Headers show
Series leds: tps68470: LED driver for TPS68470 | expand

Commit Message

Kate Hsuan March 10, 2023, 9:56 a.m. UTC
From: Hans de Goede <hdegoede@redhat.com>

All currently known models using the tps68470 PMIC have a privacy LED for
the back sensor (first ACPI consumer dev of the PMIC) connected to the
ileda output of the PMIC.

Add a LED lookup table entry for this, so that the v4l2-core code turns on
the LED when streaming from the sensor.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/intel/int3472/tps68470.c | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

Comments

Daniel Scally March 10, 2023, 11:23 a.m. UTC | #1
Hi Kate

On 10/03/2023 09:56, Kate Hsuan wrote:
> From: Hans de Goede <hdegoede@redhat.com>
> 
> All currently known models using the tps68470 PMIC have a privacy LED for
> the back sensor (first ACPI consumer dev of the PMIC) connected to the
> ileda output of the PMIC.
> 
> Add a LED lookup table entry for this, so that the v4l2-core code turns on
> the LED when streaming from the sensor.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>   drivers/platform/x86/intel/int3472/tps68470.c | 30 +++++++++++++++++--
>   1 file changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
> index 82ef022f8916..a53de9cd0540 100644
> --- a/drivers/platform/x86/intel/int3472/tps68470.c
> +++ b/drivers/platform/x86/intel/int3472/tps68470.c
> @@ -140,11 +140,18 @@ skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data
>   	return n_consumers;
>   }
>   
> +static void skl_int3472_tps68470_unregister_led_lookup(void *led_lookup)
> +{
> +	led_remove_lookup(led_lookup);
> +}
> +
>   static int skl_int3472_tps68470_probe(struct i2c_client *client)
>   {
> -	struct acpi_device *adev = ACPI_COMPANION(&client->dev);
> +	struct device *dev = &client->dev;
> +	struct acpi_device *adev = ACPI_COMPANION(dev);
>   	const struct int3472_tps68470_board_data *board_data;
>   	struct tps68470_clk_platform_data *clk_pdata;
> +	struct led_lookup_data *led_lookup;
>   	struct mfd_cell *cells;
>   	struct regmap *regmap;
>   	int n_consumers;
> @@ -177,6 +184,25 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
>   		if (!board_data)
>   			return dev_err_probe(&client->dev, -ENODEV, "No board-data found for this model\n");
>   
> +		/* Add a LED lookup table entry for the privacy LED */
> +		led_lookup = devm_kzalloc(&client->dev, sizeof(*led_lookup), GFP_KERNEL);
> +		if (!led_lookup)
> +			return -ENOMEM;
> +
> +		ret = skl_int3472_get_sensor_adev_and_name(&client->dev, NULL, &led_lookup->dev_id);
> +		if (ret)
> +			return ret;
> +
> +		led_lookup->provider = "tps68470-ileda";
> +		led_lookup->con_id = "privacy-led";
> +		led_add_lookup(led_lookup);
> +

I'm not so sure about this one, because whilst the discrete type INT3472's only have a single 
dependent, on lots of platforms the TPS68470 type has 2. skl_int3472_get_sensor_adev_and_name() will 
just get those attributes of the first dependent; that conceivably might not be the ov5693. If it 
returns the ov7251's attributes this would assign the wrong LED to it, as that one needs the IR LED 
to function.

I think that this functionality probably needs to be added to the board data returned by 
int3472_tps68470_get_board_data(), just as the GPIO lookups are.

> +		ret = devm_add_action_or_reset(&client->dev,.
> +					       skl_int3472_tps68470_unregister_led_lookup,
> +					       led_lookup);
> +		if (ret)
> +			return ret;
> +
>   		cells = kcalloc(TPS68470_WIN_MFD_CELL_COUNT, sizeof(*cells), GFP_KERNEL);
>   		if (!cells)
>   			return -ENOMEM;
> @@ -259,4 +285,4 @@ module_i2c_driver(int3472_tps68470);
>   MODULE_DESCRIPTION("Intel SkyLake INT3472 ACPI TPS68470 Device Driver");
>   MODULE_AUTHOR("Daniel Scally <djrscally@gmail.com>");
>   MODULE_LICENSE("GPL v2");
> -MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator");
> +MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator leds-tps68470");
diff mbox series

Patch

diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
index 82ef022f8916..a53de9cd0540 100644
--- a/drivers/platform/x86/intel/int3472/tps68470.c
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -140,11 +140,18 @@  skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data
 	return n_consumers;
 }
 
+static void skl_int3472_tps68470_unregister_led_lookup(void *led_lookup)
+{
+	led_remove_lookup(led_lookup);
+}
+
 static int skl_int3472_tps68470_probe(struct i2c_client *client)
 {
-	struct acpi_device *adev = ACPI_COMPANION(&client->dev);
+	struct device *dev = &client->dev;
+	struct acpi_device *adev = ACPI_COMPANION(dev);
 	const struct int3472_tps68470_board_data *board_data;
 	struct tps68470_clk_platform_data *clk_pdata;
+	struct led_lookup_data *led_lookup;
 	struct mfd_cell *cells;
 	struct regmap *regmap;
 	int n_consumers;
@@ -177,6 +184,25 @@  static int skl_int3472_tps68470_probe(struct i2c_client *client)
 		if (!board_data)
 			return dev_err_probe(&client->dev, -ENODEV, "No board-data found for this model\n");
 
+		/* Add a LED lookup table entry for the privacy LED */
+		led_lookup = devm_kzalloc(&client->dev, sizeof(*led_lookup), GFP_KERNEL);
+		if (!led_lookup)
+			return -ENOMEM;
+
+		ret = skl_int3472_get_sensor_adev_and_name(&client->dev, NULL, &led_lookup->dev_id);
+		if (ret)
+			return ret;
+
+		led_lookup->provider = "tps68470-ileda";
+		led_lookup->con_id = "privacy-led";
+		led_add_lookup(led_lookup);
+
+		ret = devm_add_action_or_reset(&client->dev,
+					       skl_int3472_tps68470_unregister_led_lookup,
+					       led_lookup);
+		if (ret)
+			return ret;
+
 		cells = kcalloc(TPS68470_WIN_MFD_CELL_COUNT, sizeof(*cells), GFP_KERNEL);
 		if (!cells)
 			return -ENOMEM;
@@ -259,4 +285,4 @@  module_i2c_driver(int3472_tps68470);
 MODULE_DESCRIPTION("Intel SkyLake INT3472 ACPI TPS68470 Device Driver");
 MODULE_AUTHOR("Daniel Scally <djrscally@gmail.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator");
+MODULE_SOFTDEP("pre: clk-tps68470 tps68470-regulator leds-tps68470");