From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-acpi@vger.kernel.org
Cc: linux-media@vger.kernel.org, rafael@kernel.org,
andriy.shevchenko@linux.intel.com,
heikki.krogerus@linux.intel.com
Subject: [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix
Date: Mon, 23 Jan 2023 15:46:16 +0200 [thread overview]
Message-ID: <20230123134617.265382-8-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20230123134617.265382-1-sakari.ailus@linux.intel.com>
For all _DSD properties, skip going through the MIPI DisCo for Imaging
property name substitution table if the property doesn't have "mipi-img-"
prefix.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/acpi/mipi.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/mipi.c b/drivers/acpi/mipi.c
index 9177170952104..3cb698b094ac1 100644
--- a/drivers/acpi/mipi.c
+++ b/drivers/acpi/mipi.c
@@ -681,16 +681,18 @@ void acpi_init_swnodes(struct acpi_device *device)
device->fwnode.secondary = software_node_fwnode(ads->nodes);
}
+#define MIPI_IMG_PREFIX "mipi-img-"
+
static const struct mipi_disco_prop {
const char *mipi_prop;
const char *dt_prop;
} mipi_disco_props[] = {
- { "mipi-img-lens-focus", "lens-focus" },
- { "mipi-img-flash-leds", "flash-leds" },
- { "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" },
+ { MIPI_IMG_PREFIX "lens-focus", "lens-focus" },
+ { MIPI_IMG_PREFIX "flash-leds", "flash-leds" },
+ { MIPI_IMG_PREFIX "clock-frequency", "clock-frequency" },
+ { MIPI_IMG_PREFIX "led-max-current", "led-max-microamp" },
+ { MIPI_IMG_PREFIX "flash-max-current", "flash-max-microamp" },
+ { MIPI_IMG_PREFIX "flash-max-timeout", "flash-max-timeout-us" },
};
/**
@@ -706,6 +708,9 @@ void acpi_properties_prepare_mipi(union acpi_object *elements)
{
unsigned int i;
+ if (!str_has_prefix(elements[0].string.pointer, MIPI_IMG_PREFIX))
+ return;
+
/* Replace MIPI DisCo for Imaging property names with DT equivalents. */
for (i = 0; i < ARRAY_SIZE(mipi_disco_props); i++) {
if (!strcmp(mipi_disco_props[i].mipi_prop,
--
2.30.2
next prev parent reply other threads:[~2023-01-23 13:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 13:46 [PATCH v2 0/8] ACPI _CRS CSI-2 and MIPI DisCo for Imaging support Sakari Ailus
2023-01-23 13:46 ` [PATCH v2 1/8] ACPI: property: Parse data node string references in properties Sakari Ailus
2023-01-23 14:51 ` Andy Shevchenko
2023-01-23 15:53 ` Sakari Ailus
2023-01-23 17:19 ` Andy Shevchenko
2023-01-23 13:46 ` [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor Sakari Ailus
2023-01-23 15:07 ` Andy Shevchenko
2023-01-23 16:07 ` Sakari Ailus
2023-01-23 17:25 ` Andy Shevchenko
2023-01-24 15:52 ` Sakari Ailus
2023-01-24 16:40 ` Andy Shevchenko
2023-01-23 13:46 ` [PATCH v2 3/8] device property: Add SOFTWARE_NODE() macro for defining software nodes Sakari Ailus
2023-01-24 11:40 ` Heikki Krogerus
2023-01-23 13:46 ` [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging Sakari Ailus
2023-01-23 15:23 ` Andy Shevchenko
2023-01-24 15:43 ` Sakari Ailus
2023-01-24 16:38 ` Andy Shevchenko
2023-01-25 8:34 ` Sakari Ailus
2023-01-24 19:26 ` Andy Shevchenko
2023-01-24 19:32 ` Andy Shevchenko
2023-01-25 8:56 ` Sakari Ailus
2023-01-25 11:46 ` Andy Shevchenko
2023-01-25 11:53 ` Sakari Ailus
2023-01-25 12:00 ` Andy Shevchenko
2023-01-25 12:02 ` Andy Shevchenko
2023-01-23 13:46 ` [PATCH v2 5/8] ACPI: property: Dig "rotation" property for devices with CSI2 _CRS Sakari Ailus
2023-01-23 13:46 ` [PATCH v2 6/8] ACPI: property: Rename parsed MIPI DisCo for Imaging properties Sakari Ailus
2023-01-23 13:46 ` Sakari Ailus [this message]
2023-01-23 15:27 ` [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix Andy Shevchenko
2023-01-24 15:54 ` Sakari Ailus
2023-01-24 16:41 ` Andy Shevchenko
2023-01-25 8:25 ` Sakari Ailus
2023-01-23 13:46 ` [PATCH v2 8/8] ACPI: property: Document _CRS CSI-2 and DisCo for Imaging support Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230123134617.265382-8-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox