|
25 | 25 | #define MAX96714_NPORTS 2 |
26 | 26 | #define MAX96714_PAD_SINK 0 |
27 | 27 | #define MAX96714_PAD_SOURCE 1 |
| 28 | +#define MAX96714_CSI_NLANES 4 |
28 | 29 |
|
29 | 30 | /* DEV */ |
30 | 31 | #define MAX96714_REG13 CCI_REG8(0x0d) |
|
52 | 53 | #define MAX96714_PATGEN_V2D CCI_REG24(0x254) |
53 | 54 | #define MAX96714_PATGEN_DE_HIGH CCI_REG16(0x257) |
54 | 55 | #define MAX96714_PATGEN_DE_LOW CCI_REG16(0x259) |
55 | | -#define MAX96714_PATGEN_DE_CNT CCI_REG16(0x25B) |
| 56 | +#define MAX96714_PATGEN_DE_CNT CCI_REG16(0x25b) |
56 | 57 | #define MAX96714_PATGEN_GRAD_INC CCI_REG8(0x25d) |
57 | | -#define MAX96714_PATGEN_CHKB_COLOR_A CCI_REG24(0x25E) |
| 58 | +#define MAX96714_PATGEN_CHKB_COLOR_A CCI_REG24(0x25e) |
58 | 59 | #define MAX96714_PATGEN_CHKB_COLOR_B CCI_REG24(0x261) |
59 | 60 | #define MAX96714_PATGEN_CHKB_RPT_CNT_A CCI_REG8(0x264) |
60 | 61 | #define MAX96714_PATGEN_CHKB_RPT_CNT_B CCI_REG8(0x265) |
@@ -724,8 +725,9 @@ static int max96714_init_tx_port(struct max96714_priv *priv) |
724 | 725 | * Unused lanes need to be mapped as well to not have |
725 | 726 | * the same lanes mapped twice. |
726 | 727 | */ |
727 | | - for (; lane < 4; lane++) { |
728 | | - unsigned int idx = find_first_zero_bit(&lanes_used, 4); |
| 728 | + for (; lane < MAX96714_CSI_NLANES; lane++) { |
| 729 | + unsigned int idx = find_first_zero_bit(&lanes_used, |
| 730 | + MAX96714_CSI_NLANES); |
729 | 731 |
|
730 | 732 | val |= idx << (lane * 2); |
731 | 733 | lanes_used |= BIT(idx); |
@@ -757,9 +759,7 @@ static int max96714_rxport_disable_poc(struct max96714_priv *priv) |
757 | 759 | static int max96714_parse_dt_txport(struct max96714_priv *priv) |
758 | 760 | { |
759 | 761 | struct device *dev = &priv->client->dev; |
760 | | - struct v4l2_fwnode_endpoint vep = { |
761 | | - .bus_type = V4L2_MBUS_CSI2_DPHY |
762 | | - }; |
| 762 | + struct v4l2_fwnode_endpoint vep = { .bus_type = V4L2_MBUS_CSI2_DPHY }; |
763 | 763 | struct fwnode_handle *ep_fwnode; |
764 | 764 | u32 num_data_lanes; |
765 | 765 | int ret; |
@@ -791,14 +791,14 @@ static int max96714_parse_dt_txport(struct max96714_priv *priv) |
791 | 791 | } |
792 | 792 |
|
793 | 793 | num_data_lanes = vep.bus.mipi_csi2.num_data_lanes; |
794 | | - if (num_data_lanes < 1 || num_data_lanes > 4) { |
| 794 | + if (num_data_lanes < 1 || num_data_lanes > MAX96714_CSI_NLANES) { |
795 | 795 | dev_err(dev, |
796 | 796 | "tx: invalid number of data lanes must be 1 to 4\n"); |
797 | 797 | ret = -EINVAL; |
798 | 798 | goto err_free_vep; |
799 | 799 | } |
800 | 800 |
|
801 | | - memcpy(&priv->mipi_csi2, &vep.bus.mipi_csi2, sizeof(priv->mipi_csi2)); |
| 801 | + priv->mipi_csi2 = vep.bus.mipi_csi2; |
802 | 802 |
|
803 | 803 | err_free_vep: |
804 | 804 | v4l2_fwnode_endpoint_free(&vep); |
|
0 commit comments