From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Jai Luthra <jai.luthra@ideasonboard.com>,
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: [PATCH 02/13] media: i2c: ds90ub960: Fix UB9702 refclk register access
Date: Fri, 04 Oct 2024 17:46:33 +0300 [thread overview]
Message-ID: <20241004-ub9xx-fixes-v1-2-e30a4633c786@ideasonboard.com> (raw)
In-Reply-To: <20241004-ub9xx-fixes-v1-0-e30a4633c786@ideasonboard.com>
UB9702 has the refclk freq register at a different offset than UB960,
but the code uses the UB960's offset for both chips. Fix this.
The refclk freq is only used for a debug print, so there's no functional
change here.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Fixes: afe267f2d368 ("media: i2c: add DS90UB960 driver")
---
drivers/media/i2c/ds90ub960.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index ffe5f25f8647..b1e848678218 100644
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -352,6 +352,8 @@
#define UB960_SR_I2C_RX_ID(n) (0xf8 + (n)) /* < UB960_FPD_RX_NPORTS */
+#define UB9702_SR_REFCLK_FREQ 0x3d
+
/* Indirect register blocks */
#define UB960_IND_TARGET_PAT_GEN 0x00
#define UB960_IND_TARGET_RX_ANA(n) (0x01 + (n))
@@ -3837,7 +3839,10 @@ static int ub960_enable_core_hw(struct ub960_data *priv)
if (ret)
goto err_pd_gpio;
- ret = ub960_read(priv, UB960_XR_REFCLK_FREQ, &refclk_freq);
+ if (priv->hw_data->is_ub9702)
+ ret = ub960_read(priv, UB9702_SR_REFCLK_FREQ, &refclk_freq);
+ else
+ ret = ub960_read(priv, UB960_XR_REFCLK_FREQ, &refclk_freq);
if (ret)
goto err_pd_gpio;
--
2.43.0
next prev parent reply other threads:[~2024-10-04 14:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-04 14:46 [PATCH 00/13] media: i2c: ds90ub9xx: Misc fixes and improvements Tomi Valkeinen
2024-10-04 14:46 ` [PATCH 01/13] media: i2c: ds90ub9x3: Fix extra fwnode_handle_put() Tomi Valkeinen
2024-10-10 14:02 ` Andy Shevchenko
2024-10-04 14:46 ` Tomi Valkeinen [this message]
2024-10-04 14:46 ` [PATCH 03/13] media: i2c: ds90ub960: Fix use of non-existing registers on UB9702 Tomi Valkeinen
2024-10-10 13:55 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 04/13] media: i2c: ds90ub960: Fix logging SP & EQ status only for UB9702 Tomi Valkeinen
2024-10-10 13:58 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 05/13] media: i2c: ds90ub960: Fix UB9702 VC map Tomi Valkeinen
2024-10-04 14:46 ` [PATCH 06/13] media: i2c: ds90ub960: Add support for I2C_RX_ID Tomi Valkeinen
2024-10-10 13:59 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 07/13] media: i2c: ds90ub960: Add RGB24, RAW8 and RAW10 formats Tomi Valkeinen
2024-10-04 14:46 ` [PATCH 08/13] media: i2c: ds90ub953: Clear CRC errors in ub953_log_status() Tomi Valkeinen
2024-10-04 14:46 ` [PATCH 09/13] media: i2c: ds90ub960: Drop unused indirect block define Tomi Valkeinen
2024-10-04 14:46 ` [PATCH 10/13] media: i2c: ds90ub960: Reduce sleep in ub960_rxport_wait_locks() Tomi Valkeinen
2024-10-10 14:00 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 11/13] media: i2c: ds90ub960: Handle errors in ub960_log_status_ub960_sp_eq() Tomi Valkeinen
2024-10-10 14:02 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 12/13] media: i2c: ds90ub913: Add error handling to ub913_hw_init() Tomi Valkeinen
2024-10-10 14:04 ` Andy Shevchenko
2024-11-08 9:34 ` Tomi Valkeinen
2024-11-08 11:27 ` Andy Shevchenko
2024-10-04 14:46 ` [PATCH 13/13] media: i2c: ds90ub953: Add error handling for i2c reads/writes Tomi Valkeinen
2024-10-10 14:06 ` Andy Shevchenko
2024-11-08 9:34 ` Tomi Valkeinen
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=20241004-ub9xx-fixes-v1-2-e30a4633c786@ideasonboard.com \
--to=tomi.valkeinen@ideasonboard.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jai.luthra@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--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
all inboxes | Powered by JetHome®