Commit d8810a66 authored by Douglas Anderson's avatar Douglas Anderson Committed by Rob Clark
Browse files

drm/msm/dsi: Take advantage of devm_regulator_bulk_get_const() 



As of the commit 1de452a0 ("regulator: core: Allow drivers to
define their init data as const") we no longer need to do copying of
regulator bulk data from initdata to something dynamic. Let's take
advantage of that.

In addition to saving some code, this also moves us to using
ARRAY_SIZE() to specify how many regulators we have which is less
error prone.

This gets rid of some layers of wrappers which makes it obvious that
we can get rid of an extra error print.
devm_regulator_bulk_get_const() prints errors for you so you don't
need an extra layer of printing.

In all cases here I have preserved the old settings without any
investigation about whether the loads being set are sensible. In the
cases of some of the PHYs if several PHYs in the same file used
exactly the same settings I had them point to the same data structure.

NOTE: Though I haven't done the math, this is likely an overall
savings in terms of "static const" data. We previously always
allocated space for 8 supplies. Each of these supplies took up 36
bytes of data (32 for name, 4 for an int).

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/496325/
Link: https://lore.kernel.org/r/20220804073608.v4.5.I55a9e65cb1c22221316629e98768ff473f47a067@changeid


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 15cde7ea

drivers/gpu/drm/msm/dsi/dsi.h

+0 −12
Original line number Diff line number Diff line
@@ -30,20 +30,8 @@ enum msm_dsi_phy_usecase { 
	MSM_DSI_PHY_SLAVE,

};



#define DSI_DEV_REGULATOR_MAX	8

#define DSI_BUS_CLK_MAX		4



/* Regulators for DSI devices */

struct dsi_reg_entry {

	char name[32];

	int enable_load;

};



struct dsi_reg_config {

	int num;

	struct dsi_reg_entry regs[DSI_DEV_REGULATOR_MAX];

};



struct msm_dsi {

	struct drm_device *dev;

	struct platform_device *pdev;

drivers/gpu/drm/msm/dsi/dsi_cfg.c

+86 −86
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ static const char * const dsi_v2_bus_clk_names[] = { 
	"core_mmss", "iface", "bus",

};



static const struct regulator_bulk_data apq8064_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 100000 },	/* 1.2 V */

	{ .supply = "avdd", .init_load_uA = 10000 },	/* 3.0 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

};



static const struct msm_dsi_config apq8064_dsi_cfg = {

	.io_offset = 0,

	.reg_cfg = {

		.num = 3,

		.regs = {

			{"vdda", 100000},	/* 1.2 V */

			{"avdd", 10000},	/* 3.0 V */

			{"vddio", 100000},	/* 1.8 V */

		},

	},

	.regulator_data = apq8064_dsi_regulators,

	.num_regulators = ARRAY_SIZE(apq8064_dsi_regulators),

	.bus_clk_names = dsi_v2_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names),

	.io_start = { 0x4700000, 0x5800000 },
@@ -29,16 +29,16 @@ static const char * const dsi_6g_bus_clk_names[] = { 
	"mdp_core", "iface", "bus", "core_mmss",

};



static const struct regulator_bulk_data msm8974_apq8084_regulators[] = {

	{ .supply = "vdd", .init_load_uA = 150000 },	/* 3.0 V */

	{ .supply = "vdda", .init_load_uA = 100000 },	/* 1.2 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

};



static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 3,

		.regs = {

			{"vdd", 150000},	/* 3.0 V */

			{"vdda", 100000},	/* 1.2 V */

			{"vddio", 100000},	/* 1.8 V */

		},

	},

	.regulator_data = msm8974_apq8084_regulators,

	.num_regulators = ARRAY_SIZE(msm8974_apq8084_regulators),

	.bus_clk_names = dsi_6g_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names),

	.io_start = { 0xfd922800, 0xfd922b00 },
@@ -49,15 +49,15 @@ static const char * const dsi_8916_bus_clk_names[] = { 
	"mdp_core", "iface", "bus",

};



static const struct regulator_bulk_data msm8916_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 100000 },	/* 1.2 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

};



static const struct msm_dsi_config msm8916_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 2,

		.regs = {

			{"vdda", 100000},	/* 1.2 V */

			{"vddio", 100000},	/* 1.8 V */

		},

	},

	.regulator_data = msm8916_dsi_regulators,

	.num_regulators = ARRAY_SIZE(msm8916_dsi_regulators),

	.bus_clk_names = dsi_8916_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names),

	.io_start = { 0x1a98000 },
@@ -68,34 +68,34 @@ static const char * const dsi_8976_bus_clk_names[] = { 
	"mdp_core", "iface", "bus",

};



static const struct regulator_bulk_data msm8976_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 100000 },	/* 1.2 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

};



static const struct msm_dsi_config msm8976_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 2,

		.regs = {

			{"vdda", 100000},	/* 1.2 V */

			{"vddio", 100000},	/* 1.8 V */

		},

	},

	.regulator_data = msm8976_dsi_regulators,

	.num_regulators = ARRAY_SIZE(msm8976_dsi_regulators),

	.bus_clk_names = dsi_8976_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names),

	.io_start = { 0x1a94000, 0x1a96000 },

	.num_dsi = 2,

};



static const struct regulator_bulk_data msm8994_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 100000 },	/* 1.25 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

	{ .supply = "vcca", .init_load_uA = 10000 },	/* 1.0 V */

	{ .supply = "vdd", .init_load_uA = 100000 },	/* 1.8 V */

	{ .supply = "lab_reg", .init_load_uA = -1 },

	{ .supply = "ibb_reg", .init_load_uA = -1 },

};



static const struct msm_dsi_config msm8994_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 6,

		.regs = {

			{"vdda", 100000},	/* 1.25 V */

			{"vddio", 100000},	/* 1.8 V */

			{"vcca", 10000},	/* 1.0 V */

			{"vdd", 100000},	/* 1.8 V */

			{"lab_reg", -1},

			{"ibb_reg", -1},

		},

	},

	.regulator_data = msm8994_dsi_regulators,

	.num_regulators = ARRAY_SIZE(msm8994_dsi_regulators),

	.bus_clk_names = dsi_6g_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names),

	.io_start = { 0xfd998000, 0xfd9a0000 },
@@ -106,16 +106,16 @@ static const char * const dsi_8996_bus_clk_names[] = { 
	"mdp_core", "iface", "bus", "core_mmss",

};



static const struct regulator_bulk_data msm8996_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 18160 },	/* 1.25 V */

	{ .supply = "vcca", .init_load_uA = 17000 },	/* 0.925 V */

	{ .supply = "vddio", .init_load_uA = 100000 },	/* 1.8 V */

};



static const struct msm_dsi_config msm8996_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 3,

		.regs = {

			{"vdda", 18160},	/* 1.25 V */

			{"vcca", 17000},	/* 0.925 V */

			{"vddio", 100000},/* 1.8 V */

		},

	},

	.regulator_data = msm8996_dsi_regulators,

	.num_regulators = ARRAY_SIZE(msm8996_dsi_regulators),

	.bus_clk_names = dsi_8996_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names),

	.io_start = { 0x994000, 0x996000 },
@@ -126,15 +126,15 @@ static const char * const dsi_msm8998_bus_clk_names[] = { 
	"iface", "bus", "core",

};



static const struct regulator_bulk_data msm8998_dsi_regulators[] = {

	{ .supply = "vdd", .init_load_uA = 367000 },	/* 0.9 V */

	{ .supply = "vdda", .init_load_uA = 62800 },	/* 1.2 V */

};



static const struct msm_dsi_config msm8998_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 2,

		.regs = {

			{"vdd", 367000},	/* 0.9 V */

			{"vdda", 62800},	/* 1.2 V */

		},

	},

	.regulator_data = msm8998_dsi_regulators,

	.num_regulators = ARRAY_SIZE(msm8998_dsi_regulators),

	.bus_clk_names = dsi_msm8998_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names),

	.io_start = { 0xc994000, 0xc996000 },
@@ -145,14 +145,14 @@ static const char * const dsi_sdm660_bus_clk_names[] = { 
	"iface", "bus", "core", "core_mmss",

};



static const struct regulator_bulk_data sdm660_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 12560 },	/* 1.2 V */

};



static const struct msm_dsi_config sdm660_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 1,

		.regs = {

			{"vdda", 12560},	/* 1.2 V */

		},

	},

	.regulator_data = sdm660_dsi_regulators,

	.num_regulators = ARRAY_SIZE(sdm660_dsi_regulators),

	.bus_clk_names = dsi_sdm660_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names),

	.io_start = { 0xc994000, 0xc996000 },
@@ -167,28 +167,28 @@ static const char * const dsi_sc7180_bus_clk_names[] = { 
	"iface", "bus",

};



static const struct regulator_bulk_data sdm845_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 21800 },	/* 1.2 V */

};



static const struct msm_dsi_config sdm845_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 1,

		.regs = {

			{"vdda", 21800},	/* 1.2 V */

		},

	},

	.regulator_data = sdm845_dsi_regulators,

	.num_regulators = ARRAY_SIZE(sdm845_dsi_regulators),

	.bus_clk_names = dsi_sdm845_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names),

	.io_start = { 0xae94000, 0xae96000 },

	.num_dsi = 2,

};



static const struct regulator_bulk_data sc7180_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 21800 },	/* 1.2 V */

};



static const struct msm_dsi_config sc7180_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 1,

		.regs = {

			{"vdda", 21800},	/* 1.2 V */

		},

	},

	.regulator_data = sc7180_dsi_regulators,

	.num_regulators = ARRAY_SIZE(sc7180_dsi_regulators),

	.bus_clk_names = dsi_sc7180_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names),

	.io_start = { 0xae94000 },
@@ -199,14 +199,14 @@ static const char * const dsi_sc7280_bus_clk_names[] = { 
	"iface", "bus",

};



static const struct regulator_bulk_data sc7280_dsi_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 8350 },	/* 1.2 V */

};



static const struct msm_dsi_config sc7280_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 1,

		.regs = {

			{"vdda", 8350},	/* 1.2 V */

		},

	},

	.regulator_data = sc7280_dsi_regulators,

	.num_regulators = ARRAY_SIZE(sc7280_dsi_regulators),

	.bus_clk_names = dsi_sc7280_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names),

	.io_start = { 0xae94000 },
@@ -217,14 +217,14 @@ static const char * const dsi_qcm2290_bus_clk_names[] = { 
	"iface", "bus",

};



static const struct regulator_bulk_data qcm2290_dsi_cfg_regulators[] = {

	{ .supply = "vdda", .init_load_uA = 21800 },	/* 1.2 V */

};



static const struct msm_dsi_config qcm2290_dsi_cfg = {

	.io_offset = DSI_6G_REG_SHIFT,

	.reg_cfg = {

		.num = 1,

		.regs = {

			{"vdda", 21800},	/* 1.2 V */

		},

	},

	.regulator_data = qcm2290_dsi_cfg_regulators,

	.num_regulators = ARRAY_SIZE(qcm2290_dsi_cfg_regulators),

	.bus_clk_names = dsi_qcm2290_bus_clk_names,

	.num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names),

	.io_start = { 0x5e94000 },

drivers/gpu/drm/msm/dsi/dsi_cfg.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 


struct msm_dsi_config {

	u32 io_offset;

	struct dsi_reg_config reg_cfg;

	const struct regulator_bulk_data *regulator_data;

	int num_regulators;

	const char * const *bus_clk_names;

	const int num_bus_clks;

	const resource_size_t io_start[DSI_MAX];

drivers/gpu/drm/msm/dsi/dsi_host.c

+11 −31
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ struct msm_dsi_host { 


	void __iomem *ctrl_base;

	phys_addr_t ctrl_size;

	struct regulator_bulk_data supplies[DSI_DEV_REGULATOR_MAX];

	struct regulator_bulk_data *supplies;



	int num_bus_clks;

	struct clk_bulk_data bus_clks[DSI_BUS_CLK_MAX];
@@ -255,28 +255,6 @@ static inline struct msm_dsi_host *to_msm_dsi_host(struct mipi_dsi_host *host) 
	return container_of(host, struct msm_dsi_host, base);

}



static int dsi_regulator_init(struct msm_dsi_host *msm_host)

{

	struct regulator_bulk_data *s = msm_host->supplies;

	const struct dsi_reg_entry *regs = msm_host->cfg_hnd->cfg->reg_cfg.regs;

	int num = msm_host->cfg_hnd->cfg->reg_cfg.num;

	int i, ret;



	for (i = 0; i < num; i++) {

		s[i].supply = regs[i].name;

		s[i].init_load_uA = regs[i].enable_load;

	}



	ret = devm_regulator_bulk_get(&msm_host->pdev->dev, num, s);

	if (ret < 0) {

		pr_err("%s: failed to init regulator, ret=%d\n",

						__func__, ret);

		return ret;

	}



	return 0;

}



int dsi_clk_init_v2(struct msm_dsi_host *msm_host)

{

	struct platform_device *pdev = msm_host->pdev;
@@ -1977,6 +1955,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 
{

	struct msm_dsi_host *msm_host = NULL;

	struct platform_device *pdev = msm_dsi->pdev;

	const struct msm_dsi_config *cfg;

	int ret;



	msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
@@ -2009,6 +1988,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 
		pr_err("%s: get config failed\n", __func__);

		goto fail;

	}

	cfg = msm_host->cfg_hnd->cfg;



	msm_host->id = dsi_host_get_id(msm_host);

	if (msm_host->id < 0) {
@@ -2018,13 +1998,13 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 
	}



	/* fixup base address by io offset */

	msm_host->ctrl_base += msm_host->cfg_hnd->cfg->io_offset;

	msm_host->ctrl_base += cfg->io_offset;



	ret = dsi_regulator_init(msm_host);

	if (ret) {

		pr_err("%s: regulator init failed\n", __func__);

	ret = devm_regulator_bulk_get_const(&pdev->dev, cfg->num_regulators,

					    cfg->regulator_data,

					    &msm_host->supplies);

	if (ret)

		goto fail;

	}



	ret = dsi_clk_init(msm_host);

	if (ret) {
@@ -2496,7 +2476,7 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, 


	msm_dsi_sfpb_config(msm_host, true);



	ret = regulator_bulk_enable(msm_host->cfg_hnd->cfg->reg_cfg.num,

	ret = regulator_bulk_enable(msm_host->cfg_hnd->cfg->num_regulators,

				    msm_host->supplies);

	if (ret) {

		pr_err("%s:Failed to enable vregs.ret=%d\n",
@@ -2537,7 +2517,7 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, 
	cfg_hnd->ops->link_clk_disable(msm_host);

	pm_runtime_put(&msm_host->pdev->dev);

fail_disable_reg:

	regulator_bulk_disable(msm_host->cfg_hnd->cfg->reg_cfg.num,

	regulator_bulk_disable(msm_host->cfg_hnd->cfg->num_regulators,

			       msm_host->supplies);

unlock_ret:

	mutex_unlock(&msm_host->dev_mutex);
@@ -2565,7 +2545,7 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host) 
	cfg_hnd->ops->link_clk_disable(msm_host);

	pm_runtime_put(&msm_host->pdev->dev);



	regulator_bulk_disable(msm_host->cfg_hnd->cfg->reg_cfg.num,

	regulator_bulk_disable(msm_host->cfg_hnd->cfg->num_regulators,

			       msm_host->supplies);



	msm_dsi_sfpb_config(msm_host, false);

drivers/gpu/drm/msm/dsi/phy/dsi_phy.c

+6 −31
Original line number Diff line number Diff line
@@ -507,33 +507,6 @@ int msm_dsi_cphy_timing_calc_v4(struct msm_dsi_dphy_timing *timing, 
	return 0;

}



static int dsi_phy_regulator_init(struct msm_dsi_phy *phy)

{

	struct regulator_bulk_data *s = phy->supplies;

	const struct dsi_reg_entry *regs = phy->cfg->reg_cfg.regs;

	struct device *dev = &phy->pdev->dev;

	int num = phy->cfg->reg_cfg.num;

	int i, ret;



	for (i = 0; i < num; i++) {

		s[i].supply = regs[i].name;

		s[i].init_load_uA = regs[i].enable_load;

	}



	ret = devm_regulator_bulk_get(dev, num, s);

	if (ret < 0) {

		if (ret != -EPROBE_DEFER) {

			DRM_DEV_ERROR(dev,

				      "%s: failed to init regulator, ret=%d\n",

				      __func__, ret);

		}



		return ret;

	}



	return 0;

}



static int dsi_phy_enable_resource(struct msm_dsi_phy *phy)

{

	struct device *dev = &phy->pdev->dev;
@@ -698,7 +671,9 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) 
			goto fail;

	}



	ret = dsi_phy_regulator_init(phy);

	ret = devm_regulator_bulk_get_const(dev, phy->cfg->num_regulators,

					    phy->cfg->regulator_data,

					    &phy->supplies);

	if (ret)

		goto fail;
@@ -780,7 +755,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, 
		goto res_en_fail;

	}



	ret = regulator_bulk_enable(phy->cfg->reg_cfg.num, phy->supplies);

	ret = regulator_bulk_enable(phy->cfg->num_regulators, phy->supplies);

	if (ret) {

		DRM_DEV_ERROR(dev, "%s: regulator enable failed, %d\n",

			__func__, ret);
@@ -817,7 +792,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, 
	if (phy->cfg->ops.disable)

		phy->cfg->ops.disable(phy);

phy_en_fail:

	regulator_bulk_disable(phy->cfg->reg_cfg.num, phy->supplies);

	regulator_bulk_disable(phy->cfg->num_regulators, phy->supplies);

reg_en_fail:

	dsi_phy_disable_resource(phy);

res_en_fail:
@@ -831,7 +806,7 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy) 


	phy->cfg->ops.disable(phy);



	regulator_bulk_disable(phy->cfg->reg_cfg.num, phy->supplies);

	regulator_bulk_disable(phy->cfg->num_regulators, phy->supplies);

	dsi_phy_disable_resource(phy);

}