Commit 7d9f1b72 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

usb: typec: qcom-pmic-typec: switch to DRM_AUX_HPD_BRIDGE 



Use the freshly defined DRM_AUX_HPD_BRIDGE instead of open-coding the
same functionality for the DRM bridge chain termination.

Acked-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231203114333.1305826-7-dmitry.baryshkov@linaro.org
parent 2bcca96a

drivers/usb/typec/tcpm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ config TYPEC_QCOM_PMIC 
	tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on DRM || DRM=n

	select DRM_AUX_HPD_BRIDGE if DRM_BRIDGE

	help

	  A Type-C port and Power Delivery driver which aggregates two

	  discrete pieces of silicon in the PM8150b PMIC block: the

drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c

+6 −35
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/usb/tcpm.h>

#include <linux/usb/typec_mux.h>



#include <drm/drm_bridge.h>

#include <drm/bridge/aux-bridge.h>



#include "qcom_pmic_typec_pdphy.h"

#include "qcom_pmic_typec_port.h"
@@ -36,7 +36,6 @@ struct pmic_typec { 
	struct pmic_typec_port	*pmic_typec_port;

	bool			vbus_enabled;

	struct mutex		lock;		/* VBUS state serialization */

	struct drm_bridge	bridge;

};



#define tcpc_to_tcpm(_tcpc_) container_of(_tcpc_, struct pmic_typec, tcpc)
@@ -150,35 +149,6 @@ static int qcom_pmic_typec_init(struct tcpc_dev *tcpc) 
	return 0;

}



#if IS_ENABLED(CONFIG_DRM)

static int qcom_pmic_typec_attach(struct drm_bridge *bridge,

				     enum drm_bridge_attach_flags flags)

{

	return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL;

}



static const struct drm_bridge_funcs qcom_pmic_typec_bridge_funcs = {

	.attach = qcom_pmic_typec_attach,

};



static int qcom_pmic_typec_init_drm(struct pmic_typec *tcpm)

{

	tcpm->bridge.funcs = &qcom_pmic_typec_bridge_funcs;

#ifdef CONFIG_OF

	tcpm->bridge.of_node = of_get_child_by_name(tcpm->dev->of_node, "connector");

#endif

	tcpm->bridge.ops = DRM_BRIDGE_OP_HPD;

	tcpm->bridge.type = DRM_MODE_CONNECTOR_DisplayPort;



	return devm_drm_bridge_add(tcpm->dev, &tcpm->bridge);

}

#else

static int qcom_pmic_typec_init_drm(struct pmic_typec *tcpm)

{

	return 0;

}

#endif



static int qcom_pmic_typec_probe(struct platform_device *pdev)

{

	struct pmic_typec *tcpm;
@@ -186,6 +156,7 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev) 
	struct device_node *np = dev->of_node;

	const struct pmic_typec_resources *res;

	struct regmap *regmap;

	struct device *bridge_dev;

	u32 base[2];

	int ret;
@@ -241,14 +212,14 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev) 
	mutex_init(&tcpm->lock);

	platform_set_drvdata(pdev, tcpm);



	ret = qcom_pmic_typec_init_drm(tcpm);

	if (ret)

		return ret;



	tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector");

	if (!tcpm->tcpc.fwnode)

		return -EINVAL;



	bridge_dev = drm_dp_hpd_bridge_register(tcpm->dev, to_of_node(tcpm->tcpc.fwnode));

	if (IS_ERR(bridge_dev))

		return PTR_ERR(bridge_dev);



	tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc);

	if (IS_ERR(tcpm->tcpm_port)) {

		ret = PTR_ERR(tcpm->tcpm_port);