Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369f81f3 authored by Todor Tomov's avatar Todor Tomov Committed by Mauro Carvalho Chehab
Browse files

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: default avatarTodor Tomov <todor.tomov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 516e8f0f

drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c

+26 −22
Original line number Diff line number Diff line
@@ -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) {

	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(i));

			       CAMSS_CSI_PHY_LNn_CFG2(l));

		writel_relaxed(settle_cnt, csiphy->base +

				       CAMSS_CSI_PHY_LNn_CFG3(i));

			       CAMSS_CSI_PHY_LNn_CFG3(l));

		writel_relaxed(0x3f, csiphy->base +

				       CAMSS_CSI_PHY_INTERRUPT_MASKn(i));

			       CAMSS_CSI_PHY_INTERRUPT_MASKn(l));

		writel_relaxed(0x3f, csiphy->base +

				       CAMSS_CSI_PHY_INTERRUPT_CLEARn(i));

		}



		lane_mask >>= 1;

		i++;

			       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);

drivers/media/platform/qcom/camss/camss-csiphy.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}

drivers/media/platform/qcom/camss/camss-csiphy.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

};