Skip to content

Commit 4cd57d6

Browse files
Sakari Ailusrafaeljw
authored andcommitted
ACPI: property: Replicate DT-aligned u32 properties from DisCo for Imaging
MIPI DisCo for Imaging defines properties for camera sensors that functionally align with DT equivalents. Replicate these properties in the ACPI device swnodes so the code using the corresponding DT properties already does not need to be updated to deal with their MIPI counterparts directly. The replicated properties are: "mipi-img-clock-frequency" -> "clock-frequency" "mipi-img-led-max-current" -> "led-max-microamp" "mipi-img-flash-max-current" -> "flash-max-microamp" "mipi-img-flash-max-timeout" -> "flash-max-timeout-us" Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> [ rjw: Changelog edits, removal of redundant braces ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Sakari Ailus <sakari.ailus@linux.intel.com>
1 parent f533e43 commit 4cd57d6

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

drivers/acpi/mipi-disco-img.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ static void init_crs_csi2_swnodes(struct crs_csi2 *csi2)
600600
struct acpi_device *adev;
601601
acpi_status status;
602602
unsigned int i;
603+
u32 val;
603604
int ret;
604605

605606
/*
@@ -631,6 +632,22 @@ static void init_crs_csi2_swnodes(struct crs_csi2 *csi2)
631632
}
632633
}
633634

635+
if (!fwnode_property_read_u32(adev_fwnode, "mipi-img-clock-frequency", &val))
636+
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_CLOCK_FREQUENCY)] =
637+
PROPERTY_ENTRY_U32("clock-frequency", val);
638+
639+
if (!fwnode_property_read_u32(adev_fwnode, "mipi-img-led-max-current", &val))
640+
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_LED_MAX_MICROAMP)] =
641+
PROPERTY_ENTRY_U32("led-max-microamp", val);
642+
643+
if (!fwnode_property_read_u32(adev_fwnode, "mipi-img-flash-max-current", &val))
644+
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_FLASH_MAX_MICROAMP)] =
645+
PROPERTY_ENTRY_U32("flash-max-microamp", val);
646+
647+
if (!fwnode_property_read_u32(adev_fwnode, "mipi-img-flash-max-timeout-us", &val))
648+
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_FLASH_MAX_TIMEOUT_US)] =
649+
PROPERTY_ENTRY_U32("flash-max-timeout-us", val);
650+
634651
status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
635652
if (ACPI_FAILURE(status)) {
636653
acpi_handle_info(handle, "Unable to get the path name\n");

include/acpi/acpi_bus.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,10 @@ struct acpi_gpio_mapping;
381381

382382
enum acpi_device_swnode_dev_props {
383383
ACPI_DEVICE_SWNODE_DEV_ROTATION,
384+
ACPI_DEVICE_SWNODE_DEV_CLOCK_FREQUENCY,
385+
ACPI_DEVICE_SWNODE_DEV_LED_MAX_MICROAMP,
386+
ACPI_DEVICE_SWNODE_DEV_FLASH_MAX_MICROAMP,
387+
ACPI_DEVICE_SWNODE_DEV_FLASH_MAX_TIMEOUT_US,
384388
ACPI_DEVICE_SWNODE_DEV_NUM_OF,
385389
ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES
386390
};

0 commit comments

Comments
 (0)