| Message ID | 20230609204228.74967-2-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | platform/x86: int3472: discrete: Regulator rework / Lenovo Miix 510 support | expand |
Hi Hans - sorry I've been late replying to this series. On 09/06/2023 21:42, Hans de Goede wrote: > The only sensor driver which needs GPIO remapping support is the ov2680 > driver and ACPI enumeration support + other necessary changes to > the ov2680 driver were never upstreamed. > > A new series updating the ov2680 driver is pending upstream now and > in this series the ov2680 driver is patched to look for "powerdown" > as con-id, instead of relying on GPIO remapping in the int3472 code, > so the GPIO remapping is no longer necessary. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com> > --- > drivers/platform/x86/intel/int3472/common.h | 6 --- > drivers/platform/x86/intel/int3472/discrete.c | 37 ++----------------- > 2 files changed, 3 insertions(+), 40 deletions(-) > > diff --git a/drivers/platform/x86/intel/int3472/common.h b/drivers/platform/x86/intel/int3472/common.h > index 0c9c899e017b..735567f374a6 100644 > --- a/drivers/platform/x86/intel/int3472/common.h > +++ b/drivers/platform/x86/intel/int3472/common.h > @@ -69,15 +69,9 @@ struct int3472_cldb { > u8 reserved2[17]; > }; > > -struct int3472_gpio_function_remap { > - const char *documented; > - const char *actual; > -}; > - > struct int3472_sensor_config { > const char *sensor_module_name; > struct regulator_consumer_supply supply_map; > - const struct int3472_gpio_function_remap *function_maps; > }; > > struct int3472_discrete_device { > diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c > index 8111579a59d4..2ab3c7466986 100644 > --- a/drivers/platform/x86/intel/int3472/discrete.c > +++ b/drivers/platform/x86/intel/int3472/discrete.c > @@ -39,27 +39,13 @@ static const guid_t cio2_sensor_module_guid = > * the functions mapping resources to the sensors. Where the sensors have > * a power enable pin defined in DSDT we need to provide a supply name so > * the sensor drivers can find the regulator. The device name will be derived > - * from the sensor's ACPI device within the code. Optionally, we can provide a > - * NULL terminated array of function name mappings to deal with any platform > - * specific deviations from the documented behaviour of GPIOs. > - * > - * Map a GPIO function name to NULL to prevent the driver from mapping that > - * GPIO at all. > + * from the sensor's ACPI device within the code. > */ > - > -static const struct int3472_gpio_function_remap ov2680_gpio_function_remaps[] = { > - { "reset", NULL }, > - { "powerdown", "reset" }, > - { } > -}; > - > static const struct int3472_sensor_config int3472_sensor_configs[] = { > - /* Lenovo Miix 510-12ISK - OV2680, Front */ > - { "GNDF140809R", { 0 }, ov2680_gpio_function_remaps }, > /* Lenovo Miix 510-12ISK - OV5648, Rear */ > - { "GEFF150023R", REGULATOR_SUPPLY("avdd", NULL), NULL }, > + { "GEFF150023R", REGULATOR_SUPPLY("avdd", NULL) }, > /* Surface Go 1&2 - OV5693, Front */ > - { "YHCU", REGULATOR_SUPPLY("avdd", NULL), NULL }, > + { "YHCU", REGULATOR_SUPPLY("avdd", NULL) }, > }; > > static const struct int3472_sensor_config * > @@ -96,7 +82,6 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 > struct acpi_resource_gpio *agpio, > const char *func, u32 polarity) > { > - const struct int3472_sensor_config *sensor_config; > char *path = agpio->resource_source.string_ptr; > struct gpiod_lookup *table_entry; > struct acpi_device *adev; > @@ -108,22 +93,6 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 > return -EINVAL; > } > > - sensor_config = int3472->sensor_config; > - if (!IS_ERR(sensor_config) && sensor_config->function_maps) { > - const struct int3472_gpio_function_remap *remap; > - > - for (remap = sensor_config->function_maps; remap->documented; remap++) { > - if (!strcmp(func, remap->documented)) { > - func = remap->actual; > - break; > - } > - } > - } > - > - /* Functions mapped to NULL should not be mapped to the sensor */ > - if (!func) > - return 0; > - > status = acpi_get_handle(NULL, path, &handle); > if (ACPI_FAILURE(status)) > return -EINVAL;
diff --git a/drivers/platform/x86/intel/int3472/common.h b/drivers/platform/x86/intel/int3472/common.h index 0c9c899e017b..735567f374a6 100644 --- a/drivers/platform/x86/intel/int3472/common.h +++ b/drivers/platform/x86/intel/int3472/common.h @@ -69,15 +69,9 @@ struct int3472_cldb { u8 reserved2[17]; }; -struct int3472_gpio_function_remap { - const char *documented; - const char *actual; -}; - struct int3472_sensor_config { const char *sensor_module_name; struct regulator_consumer_supply supply_map; - const struct int3472_gpio_function_remap *function_maps; }; struct int3472_discrete_device { diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c index 8111579a59d4..2ab3c7466986 100644 --- a/drivers/platform/x86/intel/int3472/discrete.c +++ b/drivers/platform/x86/intel/int3472/discrete.c @@ -39,27 +39,13 @@ static const guid_t cio2_sensor_module_guid = * the functions mapping resources to the sensors. Where the sensors have * a power enable pin defined in DSDT we need to provide a supply name so * the sensor drivers can find the regulator. The device name will be derived - * from the sensor's ACPI device within the code. Optionally, we can provide a - * NULL terminated array of function name mappings to deal with any platform - * specific deviations from the documented behaviour of GPIOs. - * - * Map a GPIO function name to NULL to prevent the driver from mapping that - * GPIO at all. + * from the sensor's ACPI device within the code. */ - -static const struct int3472_gpio_function_remap ov2680_gpio_function_remaps[] = { - { "reset", NULL }, - { "powerdown", "reset" }, - { } -}; - static const struct int3472_sensor_config int3472_sensor_configs[] = { - /* Lenovo Miix 510-12ISK - OV2680, Front */ - { "GNDF140809R", { 0 }, ov2680_gpio_function_remaps }, /* Lenovo Miix 510-12ISK - OV5648, Rear */ - { "GEFF150023R", REGULATOR_SUPPLY("avdd", NULL), NULL }, + { "GEFF150023R", REGULATOR_SUPPLY("avdd", NULL) }, /* Surface Go 1&2 - OV5693, Front */ - { "YHCU", REGULATOR_SUPPLY("avdd", NULL), NULL }, + { "YHCU", REGULATOR_SUPPLY("avdd", NULL) }, }; static const struct int3472_sensor_config * @@ -96,7 +82,6 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 struct acpi_resource_gpio *agpio, const char *func, u32 polarity) { - const struct int3472_sensor_config *sensor_config; char *path = agpio->resource_source.string_ptr; struct gpiod_lookup *table_entry; struct acpi_device *adev; @@ -108,22 +93,6 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347 return -EINVAL; } - sensor_config = int3472->sensor_config; - if (!IS_ERR(sensor_config) && sensor_config->function_maps) { - const struct int3472_gpio_function_remap *remap; - - for (remap = sensor_config->function_maps; remap->documented; remap++) { - if (!strcmp(func, remap->documented)) { - func = remap->actual; - break; - } - } - } - - /* Functions mapped to NULL should not be mapped to the sensor */ - if (!func) - return 0; - status = acpi_get_handle(NULL, path, &handle); if (ACPI_FAILURE(status)) return -EINVAL;
The only sensor driver which needs GPIO remapping support is the ov2680 driver and ACPI enumeration support + other necessary changes to the ov2680 driver were never upstreamed. A new series updating the ov2680 driver is pending upstream now and in this series the ov2680 driver is patched to look for "powerdown" as con-id, instead of relying on GPIO remapping in the int3472 code, so the GPIO remapping is no longer necessary. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/intel/int3472/common.h | 6 --- drivers/platform/x86/intel/int3472/discrete.c | 37 ++----------------- 2 files changed, 3 insertions(+), 40 deletions(-)