The v4l2_fwnode_device_properties contains information about the
rotation. Use it if the ssdb data is inconclusive.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/pci/intel/ipu-bridge.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c
index 441d1a5979fe94bee4738da68e185a44dbd411d4..6155046ef4fc6b5d074194d1b8113212304136bc 100644
--- a/drivers/media/pci/intel/ipu-bridge.c
+++ b/drivers/media/pci/intel/ipu-bridge.c
@@ -242,19 +242,23 @@ static int ipu_bridge_read_acpi_buffer(struct acpi_device *adev, char *id,
}
static u32 ipu_bridge_parse_rotation(struct acpi_device *adev,
- struct ipu_sensor_ssdb *ssdb)
+ struct ipu_sensor_ssdb *ssdb,
+ struct v4l2_fwnode_device_properties *props)
{
+ if (props->rotation != V4L2_FWNODE_PROPERTY_UNSET)
+ return props->rotation;
+
switch (ssdb->degree) {
case IPU_SENSOR_ROTATION_NORMAL:
return 0;
case IPU_SENSOR_ROTATION_INVERTED:
return 180;
- default:
- dev_warn(ADEV_DEV(adev),
+ }
+
+ acpi_handle_warn(acpi_device_handle(adev),
"Unknown rotation %d. Assume 0 degree rotation\n",
ssdb->degree);
- return 0;
- }
+ return 0;
}
static enum v4l2_fwnode_orientation
@@ -297,7 +301,7 @@ int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sensor)
sensor->link = ssdb.link;
sensor->lanes = ssdb.lanes;
sensor->mclkspeed = ssdb.mclkspeed;
- sensor->rotation = ipu_bridge_parse_rotation(adev, &ssdb);
+ sensor->rotation = ipu_bridge_parse_rotation(adev, &ssdb, &props);
sensor->orientation = ipu_bridge_parse_orientation(adev, &props);
if (ssdb.vcmtype)
--
2.51.0.536.g15c5d4f767-goog