Unverified Commit 92016904 authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

drm/sun4i: dw-hdmi: Fix ddc-en GPIO consumer conflict 



commit 6de79dd3 ("drm/bridge: display-connector: add ddc-en gpio
support") added a consumer for this GPIO in the HDMI connector device.
This new consumer conflicts with the pre-existing GPIO consumer in the
sun8i HDMI controller driver, which prevents the driver from probing:

  [    4.983358] display-connector connector: GPIO lookup for consumer ddc-en
  [    4.983364] display-connector connector: using device tree for GPIO lookup
  [    4.983392] gpio-226 (ddc-en): gpiod_request: status -16
  [    4.983399] sun8i-dw-hdmi 6000000.hdmi: Couldn't get ddc-en gpio
  [    4.983618] sun4i-drm display-engine: failed to bind 6000000.hdmi (ops sun8i_dw_hdmi_ops [sun8i_drm_hdmi]): -16
  [    4.984082] sun4i-drm display-engine: Couldn't bind all pipelines components
  [    4.984171] sun4i-drm display-engine: adev bind failed: -16
  [    4.984179] sun8i-dw-hdmi: probe of 6000000.hdmi failed with error -16

Both drivers have the same behavior: they leave the GPIO active for the
life of the device. Let's take advantage of the new implementation, and
drop the now-obsolete code from the HDMI controller driver.

Fixes: 6de79dd3 ("drm/bridge: display-connector: add ddc-en gpio support")
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220614073100.11550-1-samuel@sholland.org
parent 0f9cd1ea

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c

+4 −50
Original line number Diff line number Diff line
@@ -93,34 +93,10 @@ static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm, 
	return crtcs;

}



static int sun8i_dw_hdmi_find_connector_pdev(struct device *dev,

					     struct platform_device **pdev_out)

{

	struct platform_device *pdev;

	struct device_node *remote;



	remote = of_graph_get_remote_node(dev->of_node, 1, -1);

	if (!remote)

		return -ENODEV;



	if (!of_device_is_compatible(remote, "hdmi-connector")) {

		of_node_put(remote);

		return -ENODEV;

	}



	pdev = of_find_device_by_node(remote);

	of_node_put(remote);

	if (!pdev)

		return -ENODEV;



	*pdev_out = pdev;

	return 0;

}



static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,

			      void *data)

{

	struct platform_device *pdev = to_platform_device(dev), *connector_pdev;

	struct platform_device *pdev = to_platform_device(dev);

	struct dw_hdmi_plat_data *plat_data;

	struct drm_device *drm = data;

	struct device_node *phy_node;
@@ -167,30 +143,16 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, 
		return dev_err_probe(dev, PTR_ERR(hdmi->regulator),

				     "Couldn't get regulator\n");



	ret = sun8i_dw_hdmi_find_connector_pdev(dev, &connector_pdev);

	if (!ret) {

		hdmi->ddc_en = gpiod_get_optional(&connector_pdev->dev,

						  "ddc-en", GPIOD_OUT_HIGH);

		platform_device_put(connector_pdev);



		if (IS_ERR(hdmi->ddc_en)) {

			dev_err(dev, "Couldn't get ddc-en gpio\n");

			return PTR_ERR(hdmi->ddc_en);

		}

	}



	ret = regulator_enable(hdmi->regulator);

	if (ret) {

		dev_err(dev, "Failed to enable regulator\n");

		goto err_unref_ddc_en;

		return ret;

	}



	gpiod_set_value(hdmi->ddc_en, 1);



	ret = reset_control_deassert(hdmi->rst_ctrl);

	if (ret) {

		dev_err(dev, "Could not deassert ctrl reset control\n");

		goto err_disable_ddc_en;

		goto err_disable_regulator;

	}



	ret = clk_prepare_enable(hdmi->clk_tmds);
@@ -245,12 +207,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, 
	clk_disable_unprepare(hdmi->clk_tmds);

err_assert_ctrl_reset:

	reset_control_assert(hdmi->rst_ctrl);

err_disable_ddc_en:

	gpiod_set_value(hdmi->ddc_en, 0);

err_disable_regulator:

	regulator_disable(hdmi->regulator);

err_unref_ddc_en:

	if (hdmi->ddc_en)

		gpiod_put(hdmi->ddc_en);



	return ret;

}
@@ -264,11 +222,7 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master, 
	sun8i_hdmi_phy_deinit(hdmi->phy);

	clk_disable_unprepare(hdmi->clk_tmds);

	reset_control_assert(hdmi->rst_ctrl);

	gpiod_set_value(hdmi->ddc_en, 0);

	regulator_disable(hdmi->regulator);



	if (hdmi->ddc_en)

		gpiod_put(hdmi->ddc_en);

}



static const struct component_ops sun8i_dw_hdmi_ops = {

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <drm/bridge/dw_hdmi.h>

#include <drm/drm_encoder.h>

#include <linux/clk.h>

#include <linux/gpio/consumer.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>
@@ -193,7 +192,6 @@ struct sun8i_dw_hdmi { 
	struct regulator		*regulator;

	const struct sun8i_dw_hdmi_quirks *quirks;

	struct reset_control		*rst_ctrl;

	struct gpio_desc		*ddc_en;

};



extern struct platform_driver sun8i_hdmi_phy_driver;