media: camss: csiphy-3ph: add support for SM8250 CSI DPHY

Add support for CSIPHY (2PH/DPHY mode) found on SM8250 hardware.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Tested-by: Julian Grahsl <jgrahsl@snap.com>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index 783b65295d20ba5122654871f5eb688e36b6c68f..c5b0a91b36f885f6f3e6a05a80d15f1926c8adba 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -62,6 +62,7 @@ struct csiphy_reg_t {
        u32 csiphy_param_type;
 };
 
+/* GEN2 1.0 2PH */
 static const struct
 csiphy_reg_t lane_regs_sdm845[5][14] = {
        {
@@ -146,6 +147,121 @@ csiphy_reg_t lane_regs_sdm845[5][14] = {
        },
 };
 
+/* GEN2 1.2.1 2PH */
+static const struct
+csiphy_reg_t lane_regs_sm8250[5][20] = {
+       {
+               {0x0030, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0900, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0908, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0904, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0904, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0034, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0010, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x001C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+               {0x0000, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0024, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+       },
+       {
+               {0x0730, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C80, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C88, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C84, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C84, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0734, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0710, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x071C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0708, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+               {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x070c, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0724, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+       },
+       {
+               {0x0230, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0A00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0A08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0A04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0A04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0234, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0210, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x021C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0208, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+               {0x0200, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0224, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+       },
+       {
+               {0x0430, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0B00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0B08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0B04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0B04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0434, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0410, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x041C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0408, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+               {0x0400, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0424, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+       },
+       {
+               {0x0630, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0C04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0634, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0610, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x061C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0608, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+               {0x0600, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x060c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0624, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+               {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
+               {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+       },
+};
+
 static void csiphy_hw_version_read(struct csiphy_device *csiphy,
                                   struct device *dev)
 {
@@ -298,13 +414,25 @@ static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy,
 static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
                                     u8 settle_cnt)
 {
-       int i, l;
+       const struct csiphy_reg_t *r;
+       int i, l, array_size;
        u32 val;
 
-       for (l = 0; l < 5; l++) {
-               for (i = 0; i < 14; i++) {
-                       const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i];
+       switch (csiphy->camss->version) {
+       case CAMSS_845:
+               r = &lane_regs_sdm845[0][0];
+               array_size = ARRAY_SIZE(lane_regs_sdm845[0]);
+               break;
+       case CAMSS_8250:
+               r = &lane_regs_sm8250[0][0];
+               array_size = ARRAY_SIZE(lane_regs_sm8250[0]);
+               break;
+       default:
+               unreachable();
+       }
 
+       for (l = 0; l < 5; l++) {
+               for (i = 0; i < array_size; i++, r++) {
                        switch (r->csiphy_param_type) {
                        case CSIPHY_SETTLE_CNT_LOWER_BYTE:
                                val = settle_cnt & 0xff;
@@ -325,13 +453,15 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
                                s64 link_freq, u8 lane_mask)
 {
        struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
+       bool is_gen2 = (csiphy->camss->version == CAMSS_845 ||
+                       csiphy->camss->version == CAMSS_8250);
        u8 settle_cnt;
        u8 val;
        int i;
 
        settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate);
 
-       val = BIT(c->clk.pos);
+       val = is_gen2 ? BIT(7) : BIT(c->clk.pos);
        for (i = 0; i < c->num_data; i++)
                val |= BIT(c->data[i].pos * 2);
 
@@ -346,11 +476,10 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
        val = 0x00;
        writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(0));
 
-       if (csiphy->camss->version == CAMSS_8x16 ||
-           csiphy->camss->version == CAMSS_8x96)
-               csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
-       else if (csiphy->camss->version == CAMSS_845)
+       if (is_gen2)
                csiphy_gen2_config_lanes(csiphy, settle_cnt);
+       else
+               csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
 
        /* IRQ_MASK registers - disable all interrupts */
        for (i = 11; i < 22; i++)

diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index dc8b4154f92b3d1d1f87fde48f6d8cfd622b89ea..377e2474a485fd736e83e8e12a79600d88d183b5 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -69,6 +69,7 @@ enum camss_version {
        CAMSS_8x96,
        CAMSS_660,
        CAMSS_845,
+       CAMSS_8250,
 };
 
 struct camss {