From: Hans de Goede <hdegoede@redhat.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Andy Shevchenko <andy@kernel.org>,
linux-media@vger.kernel.org
Subject: [PATCH 3/3] media: Remove ov_16bit_addr_reg_helpers.h
Date: Tue, 6 Jun 2023 18:58:08 +0200 [thread overview]
Message-ID: <20230606165808.70751-4-hdegoede@redhat.com> (raw)
In-Reply-To: <20230606165808.70751-1-hdegoede@redhat.com>
The helpers in this header are not used anywhere anymore,
they have been superseded by the new CCI register access helpers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
include/media/ov_16bit_addr_reg_helpers.h | 92 -----------------------
1 file changed, 92 deletions(-)
delete mode 100644 include/media/ov_16bit_addr_reg_helpers.h
diff --git a/include/media/ov_16bit_addr_reg_helpers.h b/include/media/ov_16bit_addr_reg_helpers.h
deleted file mode 100644
index 1c60a50bd795..000000000000
--- a/include/media/ov_16bit_addr_reg_helpers.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * I2C register access helpers for Omnivision OVxxxx image sensors which expect
- * a 16 bit register address in big-endian format and which have 1-3 byte
- * wide registers, in big-endian format (for the higher width registers).
- *
- * Based on the register helpers from drivers/media/i2c/ov2680.c which is:
- * Copyright (C) 2018 Linaro Ltd
- */
-#ifndef __OV_16BIT_ADDR_REG_HELPERS_H
-#define __OV_16BIT_ADDR_REG_HELPERS_H
-
-#include <asm/unaligned.h>
-#include <linux/dev_printk.h>
-#include <linux/i2c.h>
-
-static inline int ov_read_reg(struct i2c_client *client, u16 reg,
- unsigned int len, u32 *val)
-{
- u8 addr_buf[2], data_buf[4] = { };
- struct i2c_msg msgs[2];
- int ret;
-
- if (len > 4)
- return -EINVAL;
-
- put_unaligned_be16(reg, addr_buf);
-
- msgs[0].addr = client->addr;
- msgs[0].flags = 0;
- msgs[0].len = ARRAY_SIZE(addr_buf);
- msgs[0].buf = addr_buf;
-
- msgs[1].addr = client->addr;
- msgs[1].flags = I2C_M_RD;
- msgs[1].len = len;
- msgs[1].buf = &data_buf[4 - len];
-
- ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
- if (ret != ARRAY_SIZE(msgs)) {
- dev_err(&client->dev, "read error: reg=0x%4x: %d\n", reg, ret);
- return -EIO;
- }
-
- *val = get_unaligned_be32(data_buf);
-
- return 0;
-}
-
-#define ov_read_reg8(s, r, v) ov_read_reg(s, r, 1, v)
-#define ov_read_reg16(s, r, v) ov_read_reg(s, r, 2, v)
-#define ov_read_reg24(s, r, v) ov_read_reg(s, r, 3, v)
-
-static inline int ov_write_reg(struct i2c_client *client, u16 reg,
- unsigned int len, u32 val)
-{
- u8 buf[6];
- int ret;
-
- if (len > 4)
- return -EINVAL;
-
- put_unaligned_be16(reg, buf);
- put_unaligned_be32(val << (8 * (4 - len)), buf + 2);
- ret = i2c_master_send(client, buf, len + 2);
- if (ret != len + 2) {
- dev_err(&client->dev, "write error: reg=0x%4x: %d\n", reg, ret);
- return -EIO;
- }
-
- return 0;
-}
-
-#define ov_write_reg8(s, r, v) ov_write_reg(s, r, 1, v)
-#define ov_write_reg16(s, r, v) ov_write_reg(s, r, 2, v)
-#define ov_write_reg24(s, r, v) ov_write_reg(s, r, 3, v)
-
-static inline int ov_update_reg(struct i2c_client *client, u16 reg, u8 mask, u8 val)
-{
- u32 readval;
- int ret;
-
- ret = ov_read_reg8(client, reg, &readval);
- if (ret < 0)
- return ret;
-
- val = (readval & ~mask) | (val & mask);
-
- return ov_write_reg8(client, reg, val);
-}
-
-#endif
--
2.40.1
next prev parent reply other threads:[~2023-06-06 16:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 16:58 [PATCH 0/3] media: Add MIPI CCI register access helper functions Hans de Goede
2023-06-06 16:58 ` [PATCH 1/3] " Hans de Goede
2023-06-06 20:43 ` Andy Shevchenko
2023-06-07 8:40 ` Hans de Goede
2023-06-07 12:01 ` Sakari Ailus
2023-06-07 14:55 ` Laurent Pinchart
2023-06-07 15:40 ` Andy Shevchenko
2023-06-07 15:58 ` Hans de Goede
2023-06-07 16:14 ` Andy Shevchenko
2023-06-07 16:20 ` Hans de Goede
2023-06-07 18:03 ` Andy Shevchenko
2023-06-07 7:50 ` Sakari Ailus
2023-06-07 8:46 ` Hans de Goede
2023-06-07 11:41 ` Sakari Ailus
2023-06-07 18:18 ` Laurent Pinchart
2023-06-07 19:01 ` Hans de Goede
2023-06-07 20:07 ` Andy Shevchenko
2023-06-08 8:33 ` Hans de Goede
2023-06-08 8:33 ` Sakari Ailus
2023-06-08 10:24 ` Andy Shevchenko
2023-06-08 10:27 ` Laurent Pinchart
2023-06-08 11:01 ` Sakari Ailus
2023-06-12 15:03 ` Laurent Pinchart
2023-06-13 9:57 ` Sakari Ailus
2023-06-12 13:48 ` Hans de Goede
2023-06-12 15:16 ` Laurent Pinchart
2023-06-12 15:33 ` Hans de Goede
2023-06-12 16:02 ` Laurent Pinchart
2023-06-06 16:58 ` [PATCH 2/3] media: atomisp: ov2680: Convert to new CCI register access helpers Hans de Goede
2023-06-06 20:53 ` Andy Shevchenko
2023-06-07 8:53 ` Hans de Goede
2023-06-07 15:51 ` Laurent Pinchart
2023-06-07 15:59 ` Hans de Goede
2023-06-07 16:07 ` Laurent Pinchart
2023-06-07 16:05 ` Laurent Pinchart
2023-06-07 16:18 ` Hans de Goede
2023-06-06 16:58 ` Hans de Goede [this message]
2023-06-07 15:57 ` [PATCH 3/3] media: Remove ov_16bit_addr_reg_helpers.h Laurent Pinchart
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=20230606165808.70751-4-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=andy@kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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