This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: rcar-csi2: Add support for C-PHY on R-Car V4H
Author:  Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
Date:    Sat Jul 15 22:12:39 2023 +0200

Add support for C-PHY on R-Car V4H. While the V4H supports both D-PHY
and C-PHY this patch only adds support for the C-PHY mode due to lack of
documentation and hardware to test on.

The V4H is the first Gen4 device that is enabled in the rcar-csi2
driver. There is much overlap with the Gen3 driver, the primary
difference is in how the receiver is started. The V4H have a much larger
register space and some addresses overlap with Gen3.

[Sakari Ailus: Use div_u64() to divide a 64-bit integer.]

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mche...@kernel.org>

 .../media/platform/renesas/rcar-vin/rcar-csi2.c    | 291 +++++++++++++++++++++
 1 file changed, 291 insertions(+)

---

diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c 
b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
index f536b6359146..f6326df0b09b 100644
--- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
@@ -132,6 +132,111 @@ struct rcar_csi2;
 #define PHYFRX_FORCERX_MODE_1          BIT(1)
 #define PHYFRX_FORCERX_MODE_0          BIT(0)
 
+/* V4H BASE registers */
+#define V4H_N_LANES_REG                                        0x0004
+#define V4H_CSI2_RESETN_REG                            0x0008
+#define V4H_PHY_MODE_REG                               0x001c
+#define V4H_PHY_SHUTDOWNZ_REG                          0x0040
+#define V4H_DPHY_RSTZ_REG                              0x0044
+#define V4H_FLDC_REG                                   0x0804
+#define V4H_FLDD_REG                                   0x0808
+#define V4H_IDIC_REG                                   0x0810
+#define V4H_PHY_EN_REG                                 0x2000
+
+#define V4H_ST_PHYST_REG                               0x2814
+#define V4H_ST_PHYST_ST_PHY_READY                      BIT(31)
+#define V4H_ST_PHYST_ST_STOPSTATE_3                    BIT(3)
+#define V4H_ST_PHYST_ST_STOPSTATE_2                    BIT(2)
+#define V4H_ST_PHYST_ST_STOPSTATE_1                    BIT(1)
+#define V4H_ST_PHYST_ST_STOPSTATE_0                    BIT(0)
+
+/* V4H PPI registers */
+#define V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(n)          (0x21800 + ((n) * 2)) 
/* n = 0 - 9 */
+#define V4H_PPI_STARTUP_RW_COMMON_STARTUP_1_1_REG      0x21822
+#define V4H_PPI_CALIBCTRL_RW_COMMON_BG_0_REG           0x2184c
+#define V4H_PPI_RW_LPDCOCAL_TIMEBASE_REG               0x21c02
+#define V4H_PPI_RW_LPDCOCAL_NREF_REG                   0x21c04
+#define V4H_PPI_RW_LPDCOCAL_NREF_RANGE_REG             0x21c06
+#define V4H_PPI_RW_LPDCOCAL_TWAIT_CONFIG_REG           0x21c0a
+#define V4H_PPI_RW_LPDCOCAL_VT_CONFIG_REG              0x21c0c
+#define V4H_PPI_RW_LPDCOCAL_COARSE_CFG_REG             0x21c10
+#define V4H_PPI_RW_COMMON_CFG_REG                      0x21c6c
+#define V4H_PPI_RW_TERMCAL_CFG_0_REG                   0x21c80
+#define V4H_PPI_RW_OFFSETCAL_CFG_0_REG                 0x21ca0
+
+/* V4H CORE registers */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_REG(n) (0x22040 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_LANE1_CTRL_2_REG(n) (0x22440 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_LANE2_CTRL_2_REG(n) (0x22840 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_LANE3_CTRL_2_REG(n) (0x22c40 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_LANE4_CTRL_2_REG(n) (0x23040 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_REG(n)    (0x23840 + ((n) * 2)) 
/* n = 0 - 11 */
+#define V4H_CORE_DIG_RW_COMMON_REG(n)                  (0x23880 + ((n) * 2)) 
/* n = 0 - 15 */
+#define V4H_CORE_DIG_ANACTRL_RW_COMMON_ANACTRL_REG(n)  (0x239e0 + ((n) * 2)) 
/* n = 0 - 3 */
+#define V4H_CORE_DIG_CLANE_1_RW_CFG_0_REG              0x2a400
+#define V4H_CORE_DIG_CLANE_1_RW_HS_TX_6_REG            0x2a60c
+
+/* V4H C-PHY */
+#define V4H_CORE_DIG_RW_TRIO0_REG(n)                   (0x22100 + ((n) * 2)) 
/* n = 0 - 3 */
+#define V4H_CORE_DIG_RW_TRIO1_REG(n)                   (0x22500 + ((n) * 2)) 
/* n = 0 - 3 */
+#define V4H_CORE_DIG_RW_TRIO2_REG(n)                   (0x22900 + ((n) * 2)) 
/* n = 0 - 3 */
+#define V4H_CORE_DIG_CLANE_0_RW_LP_0_REG               0x2a080
+#define V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(n)           (0x2a100 + ((n) * 2)) 
/* n = 0 - 6 */
+#define V4H_CORE_DIG_CLANE_1_RW_LP_0_REG               0x2a480
+#define V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(n)           (0x2a500 + ((n) * 2)) 
/* n = 0 - 6 */
+#define V4H_CORE_DIG_CLANE_2_RW_LP_0_REG               0x2a880
+#define V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(n)           (0x2a900 + ((n) * 2)) 
/* n = 0 - 6 */
+
+struct rcsi2_cphy_setting {
+       u16 msps;
+       u16 rx2;
+       u16 trio0;
+       u16 trio1;
+       u16 trio2;
+       u16 lane27;
+       u16 lane29;
+};
+
+static const struct rcsi2_cphy_setting cphy_setting_table_r8a779g0[] = {
+       { .msps =   80, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0134, .trio2 = 
0x6a, .lane27 = 0x0000, .lane29 = 0x0a24 },
+       { .msps =  100, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x00f5, .trio2 = 
0x55, .lane27 = 0x0000, .lane29 = 0x0a24 },
+       { .msps =  200, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0077, .trio2 = 
0x2b, .lane27 = 0x0000, .lane29 = 0x0a44 },
+       { .msps =  300, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x004d, .trio2 = 
0x1d, .lane27 = 0x0000, .lane29 = 0x0a44 },
+       { .msps =  400, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0038, .trio2 = 
0x16, .lane27 = 0x0000, .lane29 = 0x0a64 },
+       { .msps =  500, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x002b, .trio2 = 
0x12, .lane27 = 0x0000, .lane29 = 0x0a64 },
+       { .msps =  600, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0023, .trio2 = 
0x0f, .lane27 = 0x0000, .lane29 = 0x0a64 },
+       { .msps =  700, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x001d, .trio2 = 
0x0d, .lane27 = 0x0000, .lane29 = 0x0a84 },
+       { .msps =  800, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0018, .trio2 = 
0x0c, .lane27 = 0x0000, .lane29 = 0x0a84 },
+       { .msps =  900, .rx2 = 0x38, .trio0 = 0x024a, .trio1 = 0x0015, .trio2 = 
0x0b, .lane27 = 0x0000, .lane29 = 0x0a84 },
+       { .msps = 1000, .rx2 = 0x3e, .trio0 = 0x024a, .trio1 = 0x0012, .trio2 = 
0x0a, .lane27 = 0x0400, .lane29 = 0x0a84 },
+       { .msps = 1100, .rx2 = 0x44, .trio0 = 0x024a, .trio1 = 0x000f, .trio2 = 
0x09, .lane27 = 0x0800, .lane29 = 0x0a84 },
+       { .msps = 1200, .rx2 = 0x4a, .trio0 = 0x024a, .trio1 = 0x000e, .trio2 = 
0x08, .lane27 = 0x0c00, .lane29 = 0x0a84 },
+       { .msps = 1300, .rx2 = 0x51, .trio0 = 0x024a, .trio1 = 0x000c, .trio2 = 
0x08, .lane27 = 0x0c00, .lane29 = 0x0aa4 },
+       { .msps = 1400, .rx2 = 0x57, .trio0 = 0x024a, .trio1 = 0x000b, .trio2 = 
0x07, .lane27 = 0x1000, .lane29 = 0x0aa4 },
+       { .msps = 1500, .rx2 = 0x5d, .trio0 = 0x044a, .trio1 = 0x0009, .trio2 = 
0x07, .lane27 = 0x1000, .lane29 = 0x0aa4 },
+       { .msps = 1600, .rx2 = 0x63, .trio0 = 0x044a, .trio1 = 0x0008, .trio2 = 
0x07, .lane27 = 0x1400, .lane29 = 0x0aa4 },
+       { .msps = 1700, .rx2 = 0x6a, .trio0 = 0x044a, .trio1 = 0x0007, .trio2 = 
0x06, .lane27 = 0x1400, .lane29 = 0x0aa4 },
+       { .msps = 1800, .rx2 = 0x70, .trio0 = 0x044a, .trio1 = 0x0007, .trio2 = 
0x06, .lane27 = 0x1400, .lane29 = 0x0aa4 },
+       { .msps = 1900, .rx2 = 0x76, .trio0 = 0x044a, .trio1 = 0x0006, .trio2 = 
0x06, .lane27 = 0x1400, .lane29 = 0x0aa4 },
+       { .msps = 2000, .rx2 = 0x7c, .trio0 = 0x044a, .trio1 = 0x0005, .trio2 = 
0x06, .lane27 = 0x1800, .lane29 = 0x0aa4 },
+       { .msps = 2100, .rx2 = 0x83, .trio0 = 0x044a, .trio1 = 0x0005, .trio2 = 
0x05, .lane27 = 0x1800, .lane29 = 0x0aa4 },
+       { .msps = 2200, .rx2 = 0x89, .trio0 = 0x064a, .trio1 = 0x0004, .trio2 = 
0x05, .lane27 = 0x1800, .lane29 = 0x0aa4 },
+       { .msps = 2300, .rx2 = 0x8f, .trio0 = 0x064a, .trio1 = 0x0003, .trio2 = 
0x05, .lane27 = 0x1800, .lane29 = 0x0aa4 },
+       { .msps = 2400, .rx2 = 0x95, .trio0 = 0x064a, .trio1 = 0x0003, .trio2 = 
0x05, .lane27 = 0x1800, .lane29 = 0x0aa4 },
+       { .msps = 2500, .rx2 = 0x9c, .trio0 = 0x064a, .trio1 = 0x0003, .trio2 = 
0x05, .lane27 = 0x1c00, .lane29 = 0x0aa4 },
+       { .msps = 2600, .rx2 = 0xa2, .trio0 = 0x064a, .trio1 = 0x0002, .trio2 = 
0x05, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 2700, .rx2 = 0xa8, .trio0 = 0x064a, .trio1 = 0x0002, .trio2 = 
0x05, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 2800, .rx2 = 0xae, .trio0 = 0x064a, .trio1 = 0x0002, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 2900, .rx2 = 0xb5, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3000, .rx2 = 0xbb, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3100, .rx2 = 0xc1, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3200, .rx2 = 0xc7, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3300, .rx2 = 0xce, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3400, .rx2 = 0xd4, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { .msps = 3500, .rx2 = 0xda, .trio0 = 0x084a, .trio1 = 0x0001, .trio2 = 
0x04, .lane27 = 0x1c00, .lane29 = 0x0ad4 },
+       { /* sentinel */ },
+};
+
 struct phtw_value {
        u16 data;
        u16 code;
@@ -537,6 +642,11 @@ static void rcsi2_write(struct rcar_csi2 *priv, unsigned 
int reg, u32 data)
        iowrite32(data, priv->base + reg);
 }
 
+static void rcsi2_write16(struct rcar_csi2 *priv, unsigned int reg, u16 data)
+{
+       iowrite16(data, priv->base + reg);
+}
+
 static void rcsi2_enter_standby_gen3(struct rcar_csi2 *priv)
 {
        rcsi2_write(priv, PHYCNT_REG, 0);
@@ -644,6 +754,10 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv, 
unsigned int bpp,
        mbps = v4l2_ctrl_g_ctrl_int64(ctrl) * bpp;
        do_div(mbps, lanes * 1000000);
 
+       /* Adjust for C-PHY, divide by 2.8. */
+       if (priv->cphy)
+               mbps = div_u64(mbps * 5, 14);
+
        return mbps;
 }
 
@@ -833,6 +947,173 @@ static int rcsi2_start_receiver_gen3(struct rcar_csi2 
*priv)
        return 0;
 }
 
+static int rcsi2_wait_phy_start_v4h(struct rcar_csi2 *priv, u32 match)
+{
+       unsigned int timeout;
+       u32 status;
+
+       for (timeout = 0; timeout <= 10; timeout++) {
+               status = rcsi2_read(priv, V4H_ST_PHYST_REG);
+               if ((status & match) == match)
+                       return 0;
+
+               usleep_range(1000, 2000);
+       }
+
+       return -ETIMEDOUT;
+}
+
+static int rcsi2_c_phy_setting_v4h(struct rcar_csi2 *priv, int msps)
+{
+       const struct rcsi2_cphy_setting *conf;
+
+       for (conf = cphy_setting_table_r8a779g0; conf->msps != 0; conf++) {
+               if (conf->msps > msps)
+                       break;
+       }
+
+       if (!conf->msps) {
+               dev_err(priv->dev, "Unsupported PHY speed for msps setting (%u 
Msps)", msps);
+               return -ERANGE;
+       }
+
+       /* C-PHY specific */
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_COMMON_REG(7), 0x0155);
+       rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(7), 0x0068);
+       rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(8), 0x0010);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_LP_0_REG, 0x463c);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_LP_0_REG, 0x463c);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_LP_0_REG, 0x463c);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(0), 0x00d5);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(0), 0x00d5);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(0), 0x00d5);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(1), 0x0013);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(1), 0x0013);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(1), 0x0013);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(5), 0x0013);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(5), 0x0013);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(5), 0x0013);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(6), 0x000a);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(6), 0x000a);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(6), 0x000a);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_0_RW_HS_RX_REG(2), conf->rx2);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_RX_REG(2), conf->rx2);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_2_RW_HS_RX_REG(2), conf->rx2);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_REG(2), 
0x0001);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE1_CTRL_2_REG(2), 0);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE2_CTRL_2_REG(2), 
0x0001);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE3_CTRL_2_REG(2), 
0x0001);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE4_CTRL_2_REG(2), 0);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO0_REG(0), conf->trio0);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO1_REG(0), conf->trio0);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO2_REG(0), conf->trio0);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO0_REG(2), conf->trio2);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO1_REG(2), conf->trio2);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO2_REG(2), conf->trio2);
+
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO0_REG(1), conf->trio1);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO1_REG(1), conf->trio1);
+       rcsi2_write16(priv, V4H_CORE_DIG_RW_TRIO2_REG(1), conf->trio1);
+
+       /*
+        * Configure pin-swap.
+        * TODO: This registers is not documented yet, the values should depend
+        * on the 'clock-lanes' and 'data-lanes' devicetree properties.
+        */
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_CFG_0_REG, 0xf5);
+       rcsi2_write16(priv, V4H_CORE_DIG_CLANE_1_RW_HS_TX_6_REG, 0x5000);
+
+       /* Leave Shutdown mode */
+       rcsi2_write(priv, V4H_DPHY_RSTZ_REG, BIT(0));
+       rcsi2_write(priv, V4H_PHY_SHUTDOWNZ_REG, BIT(0));
+
+       /* Wait for calibration */
+       if (rcsi2_wait_phy_start_v4h(priv, V4H_ST_PHYST_ST_PHY_READY)) {
+               dev_err(priv->dev, "PHY calibration failed\n");
+               return -ETIMEDOUT;
+       }
+
+       /* C-PHY setting - analog programing*/
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_REG(9), 
conf->lane29);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANE0_CTRL_2_REG(7), 
conf->lane27);
+
+       return 0;
+}
+
+static int rcsi2_start_receiver_v4h(struct rcar_csi2 *priv)
+{
+       const struct rcar_csi2_format *format;
+       unsigned int lanes;
+       int msps;
+       int ret;
+
+       /* Calculate parameters */
+       format = rcsi2_code_to_fmt(priv->mf.code);
+       if (!format)
+               return -EINVAL;
+
+       ret = rcsi2_get_active_lanes(priv, &lanes);
+       if (ret)
+               return ret;
+
+       msps = rcsi2_calc_mbps(priv, format->bpp, lanes);
+       if (msps < 0)
+               return msps;
+
+       /* Reset LINK and PHY*/
+       rcsi2_write(priv, V4H_CSI2_RESETN_REG, 0);
+       rcsi2_write(priv, V4H_DPHY_RSTZ_REG, 0);
+       rcsi2_write(priv, V4H_PHY_SHUTDOWNZ_REG, 0);
+
+       /* PHY static setting */
+       rcsi2_write(priv, V4H_PHY_EN_REG, BIT(0));
+       rcsi2_write(priv, V4H_FLDC_REG, 0);
+       rcsi2_write(priv, V4H_FLDD_REG, 0);
+       rcsi2_write(priv, V4H_IDIC_REG, 0);
+       rcsi2_write(priv, V4H_PHY_MODE_REG, BIT(0));
+       rcsi2_write(priv, V4H_N_LANES_REG, lanes - 1);
+
+       /* Reset CSI2 */
+       rcsi2_write(priv, V4H_CSI2_RESETN_REG, BIT(0));
+
+       /* Registers static setting through APB */
+       /* Common setting */
+       rcsi2_write16(priv, V4H_CORE_DIG_ANACTRL_RW_COMMON_ANACTRL_REG(0), 
0x1bfd);
+       rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_STARTUP_1_1_REG, 0x0233);
+       rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(6), 0x0027);
+       rcsi2_write16(priv, V4H_PPI_CALIBCTRL_RW_COMMON_BG_0_REG, 0x01f4);
+       rcsi2_write16(priv, V4H_PPI_RW_TERMCAL_CFG_0_REG, 0x0013);
+       rcsi2_write16(priv, V4H_PPI_RW_OFFSETCAL_CFG_0_REG, 0x0003);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_TIMEBASE_REG, 0x004f);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_NREF_REG, 0x0320);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_NREF_RANGE_REG, 0x000f);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_TWAIT_CONFIG_REG, 0xfe18);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_VT_CONFIG_REG, 0x0c3c);
+       rcsi2_write16(priv, V4H_PPI_RW_LPDCOCAL_COARSE_CFG_REG, 0x0105);
+       rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_REG(6), 
0x1000);
+       rcsi2_write16(priv, V4H_PPI_RW_COMMON_CFG_REG, 0x0003);
+
+       /* C-PHY settings */
+       ret = rcsi2_c_phy_setting_v4h(priv, msps);
+       if (ret)
+               return ret;
+
+       rcsi2_wait_phy_start_v4h(priv, V4H_ST_PHYST_ST_STOPSTATE_0 |
+                                V4H_ST_PHYST_ST_STOPSTATE_1 |
+                                V4H_ST_PHYST_ST_STOPSTATE_2);
+
+       return 0;
+}
+
 static int rcsi2_start(struct rcar_csi2 *priv)
 {
        int ret;
@@ -1495,6 +1776,12 @@ static const struct rcar_csi2_info 
rcar_csi2_info_r8a779a0 = {
        .support_dphy = true,
 };
 
+static const struct rcar_csi2_info rcar_csi2_info_r8a779g0 = {
+       .start_receiver = rcsi2_start_receiver_v4h,
+       .use_isp = true,
+       .support_cphy = true,
+};
+
 static const struct of_device_id rcar_csi2_of_table[] = {
        {
                .compatible = "renesas,r8a774a1-csi2",
@@ -1544,6 +1831,10 @@ static const struct of_device_id rcar_csi2_of_table[] = {
                .compatible = "renesas,r8a779a0-csi2",
                .data = &rcar_csi2_info_r8a779a0,
        },
+       {
+               .compatible = "renesas,r8a779g0-csi2",
+               .data = &rcar_csi2_info_r8a779g0,
+       },
        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, rcar_csi2_of_table);

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to