mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 57f6956990f2374a9a3dca95bcc5a9e6b24896a7 Mon Sep 17 00:00:00 2001
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Date: Fri, 10 Feb 2023 00:12:05 +0200
|
|
Subject: [PATCH 685/726] media: i2c: imx290: Make use of get_unaligned_le24(),
|
|
put_unaligned_le24()
|
|
|
|
Should be upstream commit 5d129c4539c3
|
|
|
|
Since we have a proper endianness converters for LE 24-bit data use them.
|
|
|
|
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
---
|
|
drivers/media/i2c/imx290.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
|
|
index 49d6c8bdec41..330098a0772d 100644
|
|
--- a/drivers/media/i2c/imx290.c
|
|
+++ b/drivers/media/i2c/imx290.c
|
|
@@ -16,6 +16,9 @@
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/regulator/consumer.h>
|
|
+
|
|
+#include <asm/unaligned.h>
|
|
+
|
|
#include <media/media-entity.h>
|
|
#include <media/v4l2-ctrls.h>
|
|
#include <media/v4l2-device.h>
|
|
@@ -466,18 +469,20 @@ static int __always_unused imx290_read(struct imx290 *imx290, u32 addr, u32 *val
|
|
return ret;
|
|
}
|
|
|
|
- *value = (data[2] << 16) | (data[1] << 8) | data[0];
|
|
+ *value = get_unaligned_le24(data);
|
|
return 0;
|
|
}
|
|
|
|
static int imx290_write(struct imx290 *imx290, u32 addr, u32 value, int *err)
|
|
{
|
|
- u8 data[3] = { value & 0xff, (value >> 8) & 0xff, value >> 16 };
|
|
+ u8 data[3];
|
|
int ret;
|
|
|
|
if (err && *err)
|
|
return *err;
|
|
|
|
+ put_unaligned_le24(value, data);
|
|
+
|
|
ret = regmap_raw_write(imx290->regmap, addr & IMX290_REG_ADDR_MASK,
|
|
data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
|
|
if (ret < 0) {
|
|
--
|
|
2.33.1
|
|
|