Skip to content

Commit 4b3cd78

Browse files
lumaggregkh
authored andcommitted
usb: typec: qcom-pmic-typec: register drm_bridge
The current approach to handling DP on bridge-enabled platforms requires a chain of DP bridges up to the USB-C connector. Register a last DRM bridge for such chain. Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20230817150824.14371-3-dmitry.baryshkov@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0bd9e02 commit 4b3cd78

2 files changed

Lines changed: 38 additions & 0 deletions

File tree

drivers/usb/typec/tcpm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ config TYPEC_WCOVE
7979
config TYPEC_QCOM_PMIC
8080
tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver"
8181
depends on ARCH_QCOM || COMPILE_TEST
82+
depends on DRM || DRM=n
8283
help
8384
A Type-C port and Power Delivery driver which aggregates two
8485
discrete pieces of silicon in the PM8150b PMIC block: the

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
#include <linux/usb/role.h>
1818
#include <linux/usb/tcpm.h>
1919
#include <linux/usb/typec_mux.h>
20+
21+
#include <drm/drm_bridge.h>
22+
2023
#include "qcom_pmic_typec_pdphy.h"
2124
#include "qcom_pmic_typec_port.h"
2225

@@ -33,6 +36,7 @@ struct pmic_typec {
3336
struct pmic_typec_port *pmic_typec_port;
3437
bool vbus_enabled;
3538
struct mutex lock; /* VBUS state serialization */
39+
struct drm_bridge bridge;
3640
};
3741

3842
#define tcpc_to_tcpm(_tcpc_) container_of(_tcpc_, struct pmic_typec, tcpc)
@@ -146,6 +150,35 @@ static int qcom_pmic_typec_init(struct tcpc_dev *tcpc)
146150
return 0;
147151
}
148152

153+
#if IS_ENABLED(CONFIG_DRM)
154+
static int qcom_pmic_typec_attach(struct drm_bridge *bridge,
155+
enum drm_bridge_attach_flags flags)
156+
{
157+
return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL;
158+
}
159+
160+
static const struct drm_bridge_funcs qcom_pmic_typec_bridge_funcs = {
161+
.attach = qcom_pmic_typec_attach,
162+
};
163+
164+
static int qcom_pmic_typec_init_drm(struct pmic_typec *tcpm)
165+
{
166+
tcpm->bridge.funcs = &qcom_pmic_typec_bridge_funcs;
167+
#ifdef CONFIG_OF
168+
tcpm->bridge.of_node = of_get_child_by_name(tcpm->dev->of_node, "connector");
169+
#endif
170+
tcpm->bridge.ops = DRM_BRIDGE_OP_HPD;
171+
tcpm->bridge.type = DRM_MODE_CONNECTOR_DisplayPort;
172+
173+
return devm_drm_bridge_add(tcpm->dev, &tcpm->bridge);
174+
}
175+
#else
176+
static int qcom_pmic_typec_init_drm(struct pmic_typec *tcpm)
177+
{
178+
return 0;
179+
}
180+
#endif
181+
149182
static int qcom_pmic_typec_probe(struct platform_device *pdev)
150183
{
151184
struct pmic_typec *tcpm;
@@ -208,6 +241,10 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev)
208241
mutex_init(&tcpm->lock);
209242
platform_set_drvdata(pdev, tcpm);
210243

244+
ret = qcom_pmic_typec_init_drm(tcpm);
245+
if (ret)
246+
return ret;
247+
211248
tcpm->tcpc.fwnode = device_get_named_child_node(tcpm->dev, "connector");
212249
if (!tcpm->tcpc.fwnode)
213250
return -EINVAL;

0 commit comments

Comments
 (0)