Commit 042b6779 authored by Adam Ford's avatar Adam Ford Committed by Shawn Guo
Browse files

soc: imx: imx8m-blk-ctrl: Fix imx8mm mipi reset 



Most of the blk-ctrl reset bits are found in one register, however
there are two bits in offset 8 for pulling the MIPI DPHY out of reset
and one of them needs to be set when IMX8MM_DISPBLK_PD_MIPI_CSI is brought
out of reset or the MIPI_CSI hangs.

Since MIPI_DSI is impacted, add the additional one for MIPI_DSI too.

Fixes: 926e57c0 ("soc: imx: imx8m-blk-ctrl: add DISP blk-ctrl")
Signed-off-by: default avatarAdam Ford <aford173@gmail.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 737e65c7

drivers/soc/imx/imx8m-blk-ctrl.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 




#define BLK_SFT_RSTN	0x0

#define BLK_SFT_RSTN	0x0

#define BLK_CLK_EN	0x4

#define BLK_CLK_EN	0x4

#define BLK_MIPI_RESET_DIV	0x8 /* Mini/Nano DISPLAY_BLK_CTRL only */





struct imx8m_blk_ctrl_domain;

struct imx8m_blk_ctrl_domain;
@@ -36,6 +37,15 @@ struct imx8m_blk_ctrl_domain_data { 
	const char *gpc_name;

	const char *gpc_name;

	u32 rst_mask;

	u32 rst_mask;

	u32 clk_mask;

	u32 clk_mask;



	/*

	 * i.MX8M Mini and Nano have a third DISPLAY_BLK_CTRL register

	 * which is used to control the reset for the MIPI Phy.

	 * Since it's only present in certain circumstances,

	 * an if-statement should be used before setting and clearing this

	 * register.

	 */

	u32 mipi_phy_rst_mask;

};

};





#define DOMAIN_MAX_CLKS 3

#define DOMAIN_MAX_CLKS 3
@@ -78,6 +88,8 @@ static int imx8m_blk_ctrl_power_on(struct generic_pm_domain *genpd) 




	/* put devices into reset */

	/* put devices into reset */

	regmap_clear_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	regmap_clear_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	if (data->mipi_phy_rst_mask)

		regmap_clear_bits(bc->regmap, BLK_MIPI_RESET_DIV, data->mipi_phy_rst_mask);





	/* enable upstream and blk-ctrl clocks to allow reset to propagate */

	/* enable upstream and blk-ctrl clocks to allow reset to propagate */

	ret = clk_bulk_prepare_enable(data->num_clks, domain->clks);

	ret = clk_bulk_prepare_enable(data->num_clks, domain->clks);
@@ -99,6 +111,8 @@ static int imx8m_blk_ctrl_power_on(struct generic_pm_domain *genpd) 




	/* release reset */

	/* release reset */

	regmap_set_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	regmap_set_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	if (data->mipi_phy_rst_mask)

		regmap_set_bits(bc->regmap, BLK_MIPI_RESET_DIV, data->mipi_phy_rst_mask);





	/* disable upstream clocks */

	/* disable upstream clocks */

	clk_bulk_disable_unprepare(data->num_clks, domain->clks);

	clk_bulk_disable_unprepare(data->num_clks, domain->clks);
@@ -120,6 +134,9 @@ static int imx8m_blk_ctrl_power_off(struct generic_pm_domain *genpd) 
	struct imx8m_blk_ctrl *bc = domain->bc;

	struct imx8m_blk_ctrl *bc = domain->bc;





	/* put devices into reset and disable clocks */

	/* put devices into reset and disable clocks */

	if (data->mipi_phy_rst_mask)

		regmap_clear_bits(bc->regmap, BLK_MIPI_RESET_DIV, data->mipi_phy_rst_mask);



	regmap_clear_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	regmap_clear_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);

	regmap_clear_bits(bc->regmap, BLK_CLK_EN, data->clk_mask);

	regmap_clear_bits(bc->regmap, BLK_CLK_EN, data->clk_mask);
@@ -480,6 +497,7 @@ static const struct imx8m_blk_ctrl_domain_data imx8mm_disp_blk_ctl_domain_data[] 
		.gpc_name = "mipi-dsi",

		.gpc_name = "mipi-dsi",

		.rst_mask = BIT(5),

		.rst_mask = BIT(5),

		.clk_mask = BIT(8) | BIT(9),

		.clk_mask = BIT(8) | BIT(9),

		.mipi_phy_rst_mask = BIT(17),

	},

	},

	[IMX8MM_DISPBLK_PD_MIPI_CSI] = {

	[IMX8MM_DISPBLK_PD_MIPI_CSI] = {

		.name = "dispblk-mipi-csi",

		.name = "dispblk-mipi-csi",
@@ -488,6 +506,7 @@ static const struct imx8m_blk_ctrl_domain_data imx8mm_disp_blk_ctl_domain_data[] 
		.gpc_name = "mipi-csi",

		.gpc_name = "mipi-csi",

		.rst_mask = BIT(3) | BIT(4),

		.rst_mask = BIT(3) | BIT(4),

		.clk_mask = BIT(10) | BIT(11),

		.clk_mask = BIT(10) | BIT(11),

		.mipi_phy_rst_mask = BIT(16),

	},

	},

};

};