Commit a7a1550d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/hdmi: rename hpd_clks to pwr_clks 



As these clocks are now used in the runtime PM callbacks, they have no
connection to 'HPD'. Rename corresponding fields to follow clocks
purpose, to power up the HDMI controller.

Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/651720/
Link: https://lore.kernel.org/r/20250505-fd-hdmi-hpd-v5-10-48541f76318c@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent 0c5ec818

drivers/gpu/drm/msm/hdmi/hdmi.c

+13 −13
Original line number Diff line number Diff line
@@ -226,19 +226,19 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, 
	.item ## _cnt   = ARRAY_SIZE(item ## _names_ ## entry)



static const char * const pwr_reg_names_8960[] = {"core-vdda"};

static const char * const hpd_clk_names_8960[] = {"core", "master_iface", "slave_iface"};

static const char * const pwr_clk_names_8960[] = {"core", "master_iface", "slave_iface"};



static const struct hdmi_platform_config hdmi_tx_8960_config = {

		HDMI_CFG(pwr_reg, 8960),

		HDMI_CFG(hpd_clk, 8960),

		HDMI_CFG(pwr_clk, 8960),

};



static const char * const pwr_reg_names_8x74[] = {"core-vdda", "core-vcc"};

static const char * const hpd_clk_names_8x74[] = {"iface", "core", "mdp_core", "alt_iface"};

static const char * const pwr_clk_names_8x74[] = {"iface", "core", "mdp_core", "alt_iface"};



static const struct hdmi_platform_config hdmi_tx_8974_config = {

		HDMI_CFG(pwr_reg, 8x74),

		HDMI_CFG(hpd_clk, 8x74),

		HDMI_CFG(pwr_clk, 8x74),

};



static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
@@ -333,17 +333,17 @@ static int msm_hdmi_dev_probe(struct platform_device *pdev) 
	if (ret)

		return dev_err_probe(dev, ret, "failed to get pwr regulators\n");



	hdmi->hpd_clks = devm_kcalloc(&pdev->dev,

				      config->hpd_clk_cnt,

				      sizeof(hdmi->hpd_clks[0]),

	hdmi->pwr_clks = devm_kcalloc(&pdev->dev,

				      config->pwr_clk_cnt,

				      sizeof(hdmi->pwr_clks[0]),

				      GFP_KERNEL);

	if (!hdmi->hpd_clks)

	if (!hdmi->pwr_clks)

		return -ENOMEM;



	for (i = 0; i < config->hpd_clk_cnt; i++)

		hdmi->hpd_clks[i].id = config->hpd_clk_names[i];

	for (i = 0; i < config->pwr_clk_cnt; i++)

		hdmi->pwr_clks[i].id = config->pwr_clk_names[i];



	ret = devm_clk_bulk_get(&pdev->dev, config->hpd_clk_cnt, hdmi->hpd_clks);

	ret = devm_clk_bulk_get(&pdev->dev, config->pwr_clk_cnt, hdmi->pwr_clks);

	if (ret)

		return ret;
@@ -401,7 +401,7 @@ static int msm_hdmi_runtime_suspend(struct device *dev) 
	struct hdmi *hdmi = dev_get_drvdata(dev);

	const struct hdmi_platform_config *config = hdmi->config;



	clk_bulk_disable_unprepare(config->hpd_clk_cnt, hdmi->hpd_clks);

	clk_bulk_disable_unprepare(config->pwr_clk_cnt, hdmi->pwr_clks);



	pinctrl_pm_select_sleep_state(dev);
@@ -424,7 +424,7 @@ static int msm_hdmi_runtime_resume(struct device *dev) 
	if (ret)

		goto fail;



	ret = clk_bulk_prepare_enable(config->hpd_clk_cnt, hdmi->hpd_clks);

	ret = clk_bulk_prepare_enable(config->pwr_clk_cnt, hdmi->pwr_clks);

	if (ret)

		goto fail;

drivers/gpu/drm/msm/hdmi/hdmi.h

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct hdmi { 
	phys_addr_t mmio_phy_addr;



	struct regulator_bulk_data *pwr_regs;

	struct clk_bulk_data *hpd_clks;

	struct clk_bulk_data *pwr_clks;

	struct clk *extp_clk;



	struct gpio_desc *hpd_gpiod;
@@ -87,8 +87,8 @@ struct hdmi_platform_config { 
	int pwr_reg_cnt;



	/* clks that need to be on for hpd: */

	const char * const *hpd_clk_names;

	int hpd_clk_cnt;

	const char * const *pwr_clk_names;

	int pwr_clk_cnt;

};



struct hdmi_bridge {