iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: i2c: ds90ub960: Rename RXPORT_MODE_CSI2_ASYNC to RXPORT_MODE_CSI2_NONSYNC

Browse Source 
FPD-Link has an operating mode that used to be called "asynchronous" in
the hardware documentation, but that has been changed to non-synchronous
already quite a while back. The ub960 driver still had one instance of
the old naming, so let's rename it.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Tomi Valkeinen 2023-07-31 16:24:43 +03:00 committed by Mauro Carvalho Chehab
parent 618aba51c2
commit 093d69ad55
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/i2c/ds90ub960.c
View File

@ -415,8 +415,8 @@ enum ub960_rxport_mode {
RXPORT_MODE_RAW12_HF = 1, RXPORT_MODE_RAW12_HF = 1,
RXPORT_MODE_RAW12_LF = 2, RXPORT_MODE_RAW12_LF = 2,
RXPORT_MODE_CSI2_SYNC = 3, RXPORT_MODE_CSI2_SYNC = 3,
RXPORT_MODE_CSI2_ASYNC = 4, RXPORT_MODE_CSI2_NONSYNC = 4,
RXPORT_MODE_LAST = RXPORT_MODE_CSI2_ASYNC, RXPORT_MODE_LAST = RXPORT_MODE_CSI2_NONSYNC,
}; };
enum ub960_rxport_cdr { enum ub960_rxport_cdr {
@ -1609,7 +1609,7 @@ static unsigned long ub960_calc_bc_clk_rate_ub960(struct ub960_data *priv,
div = 1; div = 1;
break; break;
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
mult = 2; mult = 2;
div = 5; div = 5;
break; break;
@ -1633,7 +1633,7 @@ static unsigned long ub960_calc_bc_clk_rate_ub9702(struct ub960_data *priv,
case RXPORT_MODE_CSI2_SYNC: case RXPORT_MODE_CSI2_SYNC:
return 47187500; return 47187500;
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
return 9437500; return 9437500;
default: default:
@ -1840,7 +1840,7 @@ static void ub960_init_rx_port_ub960(struct ub960_data *priv,
bc_freq_val = 0; bc_freq_val = 0;
break; break;
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
bc_freq_val = 2; bc_freq_val = 2;
break; break;
@ -1878,7 +1878,7 @@ static void ub960_init_rx_port_ub960(struct ub960_data *priv,
return; return;
case RXPORT_MODE_CSI2_SYNC: case RXPORT_MODE_CSI2_SYNC:
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
/* CSI-2 Mode (DS90UB953-Q1 compatible) */ /* CSI-2 Mode (DS90UB953-Q1 compatible) */
ub960_rxport_update_bits(priv, nport, UB960_RR_PORT_CONFIG, 0x3, ub960_rxport_update_bits(priv, nport, UB960_RR_PORT_CONFIG, 0x3,
0x0); 0x0);
@ -1938,7 +1938,7 @@ static void ub960_init_rx_port_ub9702_fpd3(struct ub960_data *priv,
fpd_func_mode = 2; fpd_func_mode = 2;
break; break;
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
bc_freq_val = 2; bc_freq_val = 2;
fpd_func_mode = 2; fpd_func_mode = 2;
break; break;
@ -2032,7 +2032,7 @@ static void ub960_init_rx_port_ub9702_fpd4(struct ub960_data *priv,
bc_freq_val = 6; bc_freq_val = 6;
break; break;
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
bc_freq_val = 2; bc_freq_val = 2;
break; break;
@ -2098,7 +2098,7 @@ static void ub960_init_rx_port_ub9702(struct ub960_data *priv,
return; return;
case RXPORT_MODE_CSI2_SYNC: case RXPORT_MODE_CSI2_SYNC:
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
break; break;
} }
@ -2444,7 +2444,7 @@ static int ub960_configure_ports_for_streaming(struct ub960_data *priv,
/* For the rest, we are only interested in parallel busses */ /* For the rest, we are only interested in parallel busses */
if (rxport->rx_mode == RXPORT_MODE_CSI2_SYNC || if (rxport->rx_mode == RXPORT_MODE_CSI2_SYNC ||
rxport->rx_mode == RXPORT_MODE_CSI2_ASYNC) rxport->rx_mode == RXPORT_MODE_CSI2_NONSYNC)
continue; continue;
if (rx_data[nport].num_streams > 2) if (rx_data[nport].num_streams > 2)
@ -2508,7 +2508,7 @@ static int ub960_configure_ports_for_streaming(struct ub960_data *priv,
break; break;
case RXPORT_MODE_CSI2_SYNC: case RXPORT_MODE_CSI2_SYNC:
case RXPORT_MODE_CSI2_ASYNC: case RXPORT_MODE_CSI2_NONSYNC:
if (!priv->hw_data->is_ub9702) { if (!priv->hw_data->is_ub9702) {
/* Map all VCs from this port to the same VC */ /* Map all VCs from this port to the same VC */
ub960_rxport_write(priv, nport, UB960_RR_CSI_VC_MAP, ub960_rxport_write(priv, nport, UB960_RR_CSI_VC_MAP,