[media.git/next] media: i2c: ds90ub960: Fix use of non-existing registers on UB9702

[media-ci]

On Fri Dec 6 10:26:39 2024 +0200, Tomi Valkeinen wrote:
> UB9702 doesn't have the registers for SP and EQ. Adjust the code in
> ub960_rxport_wait_locks() to not use those registers for UB9702. As
> these values are only used for a debug print here, there's no functional
> change.
> 
> Cc: sta...@vger.kernel.org
> Fixes: afe267f2d368 ("media: i2c: add DS90UB960 driver")
> Reviewed-by: Jai Luthra <jai.lut...@ideasonboard.com>
> Signed-off-by: Tomi Valkeinen <tomi.valkei...@ideasonboard.com>
> Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>

Patch committed.

Thanks,
Mauro Carvalho Chehab

 drivers/media/i2c/ds90ub960.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

---

diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index 734ed32b1512..4642852883a7 100644
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -1576,16 +1576,24 @@ static int ub960_rxport_wait_locks(struct ub960_data 
*priv,
 
                ub960_rxport_read16(priv, nport, UB960_RR_RX_FREQ_HIGH, &v);
 
-               ret = ub960_rxport_get_strobe_pos(priv, nport, &strobe_pos);
-               if (ret)
-                       return ret;
+               if (priv->hw_data->is_ub9702) {
+                       dev_dbg(dev, "\trx%u: locked, freq %llu Hz\n",
+                               nport, (v * 1000000ULL) >> 8);
+               } else {
+                       ret = ub960_rxport_get_strobe_pos(priv, nport,
+                                                         &strobe_pos);
+                       if (ret)
+                               return ret;
 
-               ret = ub960_rxport_get_eq_level(priv, nport, &eq_level);
-               if (ret)
-                       return ret;
+                       ret = ub960_rxport_get_eq_level(priv, nport, &eq_level);
+                       if (ret)
+                               return ret;
 
-               dev_dbg(dev, "\trx%u: locked, SP: %d, EQ: %u, freq %llu Hz\n",
-                       nport, strobe_pos, eq_level, (v * 1000000ULL) >> 8);
+                       dev_dbg(dev,
+                               "\trx%u: locked, SP: %d, EQ: %u, freq %llu 
Hz\n",
+                               nport, strobe_pos, eq_level,
+                               (v * 1000000ULL) >> 8);
+               }
        }
 
        return 0;