aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-16 23:40:32 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-17 15:11:22 +0200
commit20ea6adbf199097c4f5f591ffee088340630dae4 (patch)
treed6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
parentbca05bd072180dc38ef740b37ded9572a6db1981 (diff)
downloadupstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip
bcm27xx: add support for linux v5.15
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch b/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
new file mode 100644
index 0000000000..2644c5659b
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
@@ -0,0 +1,42 @@
+From 18e32b190c3e58cba734073706d5ff0fcd7cbba3 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 6 Jul 2020 17:51:32 +0100
+Subject: [PATCH] media: i2c: ov9281: Read chip ID via 2 reads
+
+Vision Components have made an OV9281 module which blocks reading
+back the majority of registers to comply with NDAs, and in doing
+so doesn't allow auto-increment register reading as used when
+reading the chip ID.
+
+Use two reads and manually combine the results.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov9281.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+--- a/drivers/media/i2c/ov9281.c
++++ b/drivers/media/i2c/ov9281.c
+@@ -904,13 +904,17 @@ static int ov9281_check_sensor_id(struct
+ struct i2c_client *client)
+ {
+ struct device *dev = &ov9281->client->dev;
+- u32 id = 0;
++ u32 id = 0, id_msb;
+ int ret;
+
+- ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID,
+- OV9281_REG_VALUE_16BIT, &id);
+- if (id != CHIP_ID) {
+- dev_err(dev, "Unexpected sensor id(%06x), ret(%d)\n", id, ret);
++ ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID + 1,
++ OV9281_REG_VALUE_08BIT, &id);
++ if (!ret)
++ ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID,
++ OV9281_REG_VALUE_08BIT, &id_msb);
++ id |= (id_msb << 8);
++ if (ret || id != CHIP_ID) {
++ dev_err(dev, "Unexpected sensor id(%04x), ret(%d)\n", id, ret);
+ return -ENODEV;
+ }
+