media: camss: csiphy: Unify lane handling

Restructure lane configuration so it is simpler and will allow
similar (although not the same) handling for different hardware
versions.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
index 5485d1f..c832539 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
@@ -86,7 +86,7 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
 {
        struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
        u8 settle_cnt;
-       u8 val;
+       u8 val, l = 0;
        int i = 0;
 
        settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
@@ -104,34 +104,38 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
        val = cfg->combo_mode << 4;
        writel_relaxed(val, csiphy->base + CAMSS_CSI_PHY_GLBL_RESET);
 
-       while (lane_mask) {
-               if (lane_mask & 0x1) {
-                       writel_relaxed(0x10, csiphy->base +
-                                      CAMSS_CSI_PHY_LNn_CFG2(i));
-                       writel_relaxed(settle_cnt, csiphy->base +
-                                      CAMSS_CSI_PHY_LNn_CFG3(i));
-                       writel_relaxed(0x3f, csiphy->base +
-                                      CAMSS_CSI_PHY_INTERRUPT_MASKn(i));
-                       writel_relaxed(0x3f, csiphy->base +
-                                      CAMSS_CSI_PHY_INTERRUPT_CLEARn(i));
-               }
-
-               lane_mask >>= 1;
-               i++;
+       for (i = 0; i <= c->num_data; i++) {
+               if (i == c->num_data)
+                       l = c->clk.pos;
+               else
+                       l = c->data[i].pos;
+
+               writel_relaxed(0x10, csiphy->base +
+                              CAMSS_CSI_PHY_LNn_CFG2(l));
+               writel_relaxed(settle_cnt, csiphy->base +
+                              CAMSS_CSI_PHY_LNn_CFG3(l));
+               writel_relaxed(0x3f, csiphy->base +
+                              CAMSS_CSI_PHY_INTERRUPT_MASKn(l));
+               writel_relaxed(0x3f, csiphy->base +
+                              CAMSS_CSI_PHY_INTERRUPT_CLEARn(l));
        }
 }
 
-static void csiphy_lanes_disable(struct csiphy_device *csiphy, u8 lane_mask)
+static void csiphy_lanes_disable(struct csiphy_device *csiphy,
+                                struct csiphy_config *cfg)
 {
+       struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
+       u8 l = 0;
        int i = 0;
 
-       while (lane_mask) {
-               if (lane_mask & 0x1)
-                       writel_relaxed(0x0, csiphy->base +
-                                      CAMSS_CSI_PHY_LNn_CFG2(i));
+       for (i = 0; i <= c->num_data; i++) {
+               if (i == c->num_data)
+                       l = c->clk.pos;
+               else
+                       l = c->data[i].pos;
 
-               lane_mask >>= 1;
-               i++;
+               writel_relaxed(0x0, csiphy->base +
+                              CAMSS_CSI_PHY_LNn_CFG2(l));
        }
 
        writel_relaxed(0x0, csiphy->base + CAMSS_CSI_PHY_GLBL_PWR_CFG);

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index 8d10e85..d35eea0 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -296,9 +296,7 @@ static int csiphy_stream_on(struct csiphy_device *csiphy)
  */
 static void csiphy_stream_off(struct csiphy_device *csiphy)
 {
-       u8 lane_mask = csiphy_get_lane_mask(&csiphy->cfg.csi2->lane_cfg);
-
-       csiphy->ops->lanes_disable(csiphy, lane_mask);
+       csiphy->ops->lanes_disable(csiphy, &csiphy->cfg);
 }
 
 

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
index edad941..e3dd257 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.h
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
@@ -51,7 +51,8 @@ struct csiphy_hw_ops {
        void (*lanes_enable)(struct csiphy_device *csiphy,
                             struct csiphy_config *cfg,
                             u32 pixel_clock, u8 bpp, u8 lane_mask);
-       void (*lanes_disable)(struct csiphy_device *csiphy, u8 lane_mask);
+       void (*lanes_disable)(struct csiphy_device *csiphy,
+                             struct csiphy_config *cfg);
        irqreturn_t (*isr)(int irq, void *dev);
 };