| Message ID | 20230117122244.2546597-6-sakari.ailus@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ACPI _CRS CSI-2 and MIPI DisCo for Imaging support | expand |
Hi Andy, On Tue, Jan 17, 2023 at 05:22:11PM +0200, Andy Shevchenko wrote: > On Tue, Jan 17, 2023 at 02:22:41PM +0200, Sakari Ailus wrote: > > Dig "rotation" property value for devices with _CRS CSI2 resource > > descriptor. The value comes from _PLD (physical location of device) > > object, if it exists for the device. > > > > This way camera sensor drivers that know the "rotation" property do not > > need to care about _PLD on ACPI. > > ... > > > + if (fwnode_property_read_u32(fwnode, "rotation", &val) && > > + acpi_get_physical_device_location(acpi_device_handle(device), > > + &pld) == AE_OK) { > > ACPI_SUCCESS() ? Yes. > > ... > > > + ads->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] = > > + PROPERTY_ENTRY_U32("rotation", > > + (u32)pld->rotation * 45U); > > Why do you need casting? I think it's actually not needed.
diff --git a/drivers/acpi/mipi.c b/drivers/acpi/mipi.c index cc80d79f4a381..bd09eac0a52e4 100644 --- a/drivers/acpi/mipi.c +++ b/drivers/acpi/mipi.c @@ -632,15 +632,32 @@ static void init_port_csi2_remote(struct acpi_device *device, */ void acpi_init_swnodes(struct acpi_device *device) { + struct fwnode_handle *fwnode = acpi_fwnode_handle(device); struct acpi_device_software_nodes *ads; struct acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER }; + struct acpi_pld_info *pld; + unsigned int prop_index = 0; unsigned int i; + u32 val; int ret; device->swnodes = ads = crs_csi2_swnode_get(device->handle); if (!ads) return; + /* + * Check if "rotation" property exists and if it doesn't but there's a + * _PLD object, then get the rotation value from there. + */ + if (fwnode_property_read_u32(fwnode, "rotation", &val) && + acpi_get_physical_device_location(acpi_device_handle(device), + &pld) == AE_OK) { + ads->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] = + PROPERTY_ENTRY_U32("rotation", + (u32)pld->rotation * 45U); + kfree(pld); + } + if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) { acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n"); return; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 9a7729e96d14c..3c4a1daed33f1 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -361,6 +361,7 @@ struct acpi_device_data { struct acpi_gpio_mapping; enum acpi_device_swnode_dev_props { + ACPI_DEVICE_SWNODE_DEV_ROTATION, ACPI_DEVICE_SWNODE_DEV_NUM_OF, ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES };
Dig "rotation" property value for devices with _CRS CSI2 resource descriptor. The value comes from _PLD (physical location of device) object, if it exists for the device. This way camera sensor drivers that know the "rotation" property do not need to care about _PLD on ACPI. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/acpi/mipi.c | 17 +++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 18 insertions(+)