Commit c553ca92 authored by Peng Fan's avatar Peng Fan Committed by Shawn Guo
Browse files

soc: imx: add icc paths for i.MX8MP media blk ctrl 



Add interconnect paths for i.MX8MP media blk ctrl

Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 64e61a94

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

+39 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */



#include <linux/device.h>

#include <linux/interconnect.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>
@@ -37,6 +38,8 @@ struct imx8m_blk_ctrl_domain_data { 
	const char *name;

	const char * const *clk_names;

	int num_clks;

	const char * const *path_names;

	int num_paths;

	const char *gpc_name;

	u32 rst_mask;

	u32 clk_mask;
@@ -52,13 +55,16 @@ struct imx8m_blk_ctrl_domain_data { 
};



#define DOMAIN_MAX_CLKS 4

#define DOMAIN_MAX_PATHS 4



struct imx8m_blk_ctrl_domain {

	struct generic_pm_domain genpd;

	const struct imx8m_blk_ctrl_domain_data *data;

	struct clk_bulk_data clks[DOMAIN_MAX_CLKS];

	struct icc_bulk_data paths[DOMAIN_MAX_PATHS];

	struct device *power_dev;

	struct imx8m_blk_ctrl *bc;

	int num_paths;

};



struct imx8m_blk_ctrl_data {
@@ -117,6 +123,10 @@ static int imx8m_blk_ctrl_power_on(struct generic_pm_domain *genpd) 
	if (data->mipi_phy_rst_mask)

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



	ret = icc_bulk_set_bw(domain->num_paths, domain->paths);

	if (ret)

		dev_err(bc->dev, "failed to set icc bw\n");



	/* disable upstream clocks */

	clk_bulk_disable_unprepare(data->num_clks, domain->clks);
@@ -224,10 +234,29 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev) 
		int j;



		domain->data = data;

		domain->num_paths = data->num_paths;



		for (j = 0; j < data->num_clks; j++)

			domain->clks[j].id = data->clk_names[j];



		for (j = 0; j < data->num_paths; j++) {

			domain->paths[j].name = data->path_names[j];

			/* Fake value for now, just let ICC could configure NoC mode/priority */

			domain->paths[j].avg_bw = 1;

			domain->paths[j].peak_bw = 1;

		}



		ret = devm_of_icc_bulk_get(dev, data->num_paths, domain->paths);

		if (ret) {

			if (ret != -EPROBE_DEFER) {

				dev_warn_once(dev, "Could not get interconnect paths, NoC will stay unconfigured!\n");

				domain->num_paths = 0;

			} else {

				dev_err_probe(dev, ret, "failed to get noc entries\n");

				goto cleanup_pds;

			}

		}



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

		if (ret) {

			dev_err_probe(dev, ret, "failed to get clock\n");
@@ -650,6 +679,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
		.gpc_name = "lcdif1",

		.rst_mask = BIT(4) | BIT(5) | BIT(23),

		.clk_mask = BIT(4) | BIT(5) | BIT(23),

		.path_names = (const char *[]){"lcdif-rd", "lcdif-wr"},

		.num_paths = 2,

	},

	[IMX8MP_MEDIABLK_PD_ISI] = {

		.name = "mediablk-isi",
@@ -658,6 +689,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
		.gpc_name = "isi",

		.rst_mask = BIT(6) | BIT(7),

		.clk_mask = BIT(6) | BIT(7),

		.path_names = (const char *[]){"isi0", "isi1", "isi2"},

		.num_paths = 3,

	},

	[IMX8MP_MEDIABLK_PD_MIPI_CSI2_2] = {

		.name = "mediablk-mipi-csi2-2",
@@ -675,6 +708,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
		.gpc_name = "lcdif2",

		.rst_mask = BIT(11) | BIT(12) | BIT(24),

		.clk_mask = BIT(11) | BIT(12) | BIT(24),

		.path_names = (const char *[]){"lcdif-rd", "lcdif-wr"},

		.num_paths = 2,

	},

	[IMX8MP_MEDIABLK_PD_ISP] = {

		.name = "mediablk-isp",
@@ -683,6 +718,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
		.gpc_name = "isp",

		.rst_mask = BIT(16) | BIT(17) | BIT(18),

		.clk_mask = BIT(16) | BIT(17) | BIT(18),

		.path_names = (const char *[]){"isp0", "isp1"},

		.num_paths = 2,

	},

	[IMX8MP_MEDIABLK_PD_DWE] = {

		.name = "mediablk-dwe",
@@ -691,6 +728,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
		.gpc_name = "dwe",

		.rst_mask = BIT(19) | BIT(20) | BIT(21),

		.clk_mask = BIT(19) | BIT(20) | BIT(21),

		.path_names = (const char *[]){"dwe"},

		.num_paths = 1,

	},

	[IMX8MP_MEDIABLK_PD_MIPI_DSI_2] = {

		.name = "mediablk-mipi-dsi-2",