On Tue, Apr 23, 2024 at 03:18:58AM +0800, Sui Jingfeng wrote:
> Make this driver less DT-dependent by using the fwnode helper functions,
> should be no functional changes for DT based systems. Do the necessary
> works before it can be truely DT-independent, this patch do no harms even
> though there is no user yet.
>
> Signed-off-by: Sui Jingfeng <sui.jingfeng@xxxxxxxxx>
> ---
> drivers/gpu/drm/bridge/display-connector.c | 24 +++++++++++-----------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
> index ab8e00baf3f1..d80cb7bc59e6 100644
> --- a/drivers/gpu/drm/bridge/display-connector.c
> +++ b/drivers/gpu/drm/bridge/display-connector.c
> @@ -204,6 +204,7 @@ static int display_connector_get_supply(struct platform_device *pdev,
>
> static int display_connector_probe(struct platform_device *pdev)
> {
> + struct fwnode_handle *fwnode = dev_fwnode(&pdev->dev);
> struct display_connector *conn;
> unsigned int type;
> const char *label = NULL;
> @@ -215,15 +216,15 @@ static int display_connector_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, conn);
>
> - type = (uintptr_t)of_device_get_match_data(&pdev->dev);
> + type = (uintptr_t)device_get_match_data(&pdev->dev);
>
> /* Get the exact connector type. */
> switch (type) {
> case DRM_MODE_CONNECTOR_DVII: {
> bool analog, digital;
>
> - analog = of_property_read_bool(pdev->dev.of_node, "analog");
> - digital = of_property_read_bool(pdev->dev.of_node, "digital");
> + analog = fwnode_property_present(fwnode, "analog");
> + digital = fwnode_property_present(fwnode, "digital");
> if (analog && !digital) {
> conn->bridge.type = DRM_MODE_CONNECTOR_DVIA;
> } else if (!analog && digital) {
> @@ -240,8 +241,7 @@ static int display_connector_probe(struct platform_device *pdev)
> case DRM_MODE_CONNECTOR_HDMIA: {
> const char *hdmi_type;
>
> - ret = of_property_read_string(pdev->dev.of_node, "type",
> - &hdmi_type);
> + ret = fwnode_property_read_string(fwnode, "type", &hdmi_type);
> if (ret < 0) {
> dev_err(&pdev->dev, "HDMI connector with no type\n");
> return -EINVAL;
> @@ -271,7 +271,7 @@ static int display_connector_probe(struct platform_device *pdev)
> conn->bridge.interlace_allowed = true;
>
> /* Get the optional connector label. */
> - of_property_read_string(pdev->dev.of_node, "label", &label);
> + fwnode_property_read_string(fwnode, "label", &label);
>
> /*
> * Get the HPD GPIO for DVI, HDMI and DP connectors. If the GPIO can provide
> @@ -309,12 +309,12 @@ static int display_connector_probe(struct platform_device *pdev)
> if (type == DRM_MODE_CONNECTOR_DVII ||
> type == DRM_MODE_CONNECTOR_HDMIA ||
> type == DRM_MODE_CONNECTOR_VGA) {
> - struct device_node *phandle;
> + struct fwnode_handle *phandle;
>
> - phandle = of_parse_phandle(pdev->dev.of_node, "ddc-i2c-bus", 0);
> - if (phandle) {
> - conn->bridge.ddc = of_get_i2c_adapter_by_node(phandle);
> - of_node_put(phandle);
> + phandle = fwnode_find_reference(fwnode, "ddc-i2c-bus", 0);
> + if (!IS_ERR_OR_NULL(phandle)) {
s/IS_ERR_OR_NULL/IS_ERR/
LGTM otherwise.
> + conn->bridge.ddc = i2c_get_adapter_by_fwnode(phandle);
> + fwnode_handle_put(phandle);
> if (!conn->bridge.ddc)
> return -EPROBE_DEFER;
> } else {
> @@ -358,7 +358,7 @@ static int display_connector_probe(struct platform_device *pdev)
> }
>
> conn->bridge.funcs = &display_connector_bridge_funcs;
> - conn->bridge.of_node = pdev->dev.of_node;
> + drm_bridge_set_node(&conn->bridge, fwnode);
>
> if (conn->bridge.ddc)
> conn->bridge.ops |= DRM_BRIDGE_OP_EDID
> --
> 2.34.1
>
--
With best wishes
Dmitry
