From patchwork Mon Jul 31 07:19:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 708494 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46A49C41513 for ; Mon, 31 Jul 2023 07:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231497AbjGaHXw (ORCPT ); Mon, 31 Jul 2023 03:23:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231640AbjGaHXH (ORCPT ); Mon, 31 Jul 2023 03:23:07 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31931BE8 for ; Mon, 31 Jul 2023 00:19:35 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b9c0391749so62977121fa.0 for ; Mon, 31 Jul 2023 00:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690787974; x=1691392774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p9MGyANrADJosQKLWXEJL6AuVBkwmnSxhWxzqgUxeDs=; b=piVz/2rETh6217M/f6i0Q6ZjKGhMNsPoFI+k3rqnvxel9JQpVmmF7L76pu2qkb7xeT BBZbff7VCmJaHWjGFDHIFDrNS+q3XYwrON5+p8XeGpLu/BXjoTsik1NZ7GMDn+Vd8qNo kVmyvdzWQbcDPE4Pin1xzwdyhRFeIl0jou6cSsdFvQlKn/dAPdplUxh/PD3EaZMcku+N DOSGFrSqBEwQQwheh8iyXW8WLSYurGHMQTvs3bXt8FtIV2iN8zgz8crGmD36fpgQH4Qt 5IXz4tUR/dwYAWtBimvMwicS/1y5PqFUapnmV5X5bQlpgukW+OxD71W0C13sSxtemenw KORA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690787974; x=1691392774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9MGyANrADJosQKLWXEJL6AuVBkwmnSxhWxzqgUxeDs=; b=Z3oevHOO54HB7pN+m5TUslUWtANBduKCfWQLUwdLHD+xILr8My0daWA7dwBj5yZEp0 cevVSzXxnKogxgARmGXFDIgbPxCODeKZnSl7y+CIjOUr1dbCNnHASYr8ZIE66zna0CYp loO1pnB5J1sAoEgeTo9kOs4A0df/lts3vZbiMYA7532WMyipKSeopFdgDO6VPq7gMoNK jVHde+gDGq32k0kXbLQvgUiSw3k/C3YY9tcDJajUglbdOg/vF18sNneUI55I2dPM5thM PPvFY/qS6myY+nlgUhkOBJFpJQfsSW4NV53zy3vJBj0+M1StHpBaSX1LlaQdqKLPKK3i sT9Q== X-Gm-Message-State: ABy/qLb01VXiEMgbsAGbTHLcjrza/O7I+m+TeeGWPhfwPdImqWUexbTk XZgQw2v42cGy2+MaPQfGvCczOw== X-Google-Smtp-Source: APBJJlG61MVi0i6bAnxXBUkji+YPklYbMxq6Ejl/++UF5Y1SPJJelkJLvjpBW8AE6Y10ZH9Lm1OsDA== X-Received: by 2002:a2e:2405:0:b0:2b9:36d5:729c with SMTP id k5-20020a2e2405000000b002b936d5729cmr5802465ljk.47.1690787973813; Mon, 31 Jul 2023 00:19:33 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id c4-20020a2ea1c4000000b002b71c128ea0sm2413267ljm.117.2023.07.31.00.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 00:19:33 -0700 (PDT) From: Dmitry Baryshkov To: David Airlie , Daniel Vetter , Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Heikki Krogerus , Greg Kroah-Hartman , Neil Armstrong Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-usb@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 2/3] phy: qcom: qmp-combo: switch to DRM_SIMPLE_BRIDGE Date: Mon, 31 Jul 2023 10:19:29 +0300 Message-Id: <20230731071930.3928150-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230731071930.3928150-1-dmitry.baryshkov@linaro.org> References: <20230731071930.3928150-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Switch to using the new DRM_SIMPLE_BRIDGE helper to create the transparent DRM bridge device instead of handcoding corresponding functionality. Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/Kconfig | 2 +- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 44 ++--------------------- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig index ced603806375..fb03e3b3f637 100644 --- a/drivers/phy/qualcomm/Kconfig +++ b/drivers/phy/qualcomm/Kconfig @@ -63,7 +63,7 @@ config PHY_QCOM_QMP_COMBO depends on DRM || DRM=n select GENERIC_PHY select MFD_SYSCON - select DRM_PANEL_BRIDGE if DRM + select DRM_SIMPLE_BRIDGE if DRM help Enable this to support the QMP Combo PHY transceiver that is used with USB3 and DisplayPort controllers on Qualcomm chips. diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 1793d49bf45c..4bf64899cc71 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include @@ -1419,8 +1419,6 @@ struct qmp_combo { struct clk_hw dp_link_hw; struct clk_hw dp_pixel_hw; - struct drm_bridge bridge; - struct typec_switch_dev *sw; enum typec_orientation orientation; }; @@ -3193,44 +3191,6 @@ static int qmp_combo_typec_switch_register(struct qmp_combo *qmp) } #endif -#if IS_ENABLED(CONFIG_DRM) -static int qmp_combo_bridge_attach(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags) -{ - struct qmp_combo *qmp = container_of(bridge, struct qmp_combo, bridge); - struct drm_bridge *next_bridge; - - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) - return -EINVAL; - - next_bridge = devm_drm_of_get_bridge(qmp->dev, qmp->dev->of_node, 0, 0); - if (IS_ERR(next_bridge)) { - dev_err(qmp->dev, "failed to acquire drm_bridge: %pe\n", next_bridge); - return PTR_ERR(next_bridge); - } - - return drm_bridge_attach(bridge->encoder, next_bridge, bridge, - DRM_BRIDGE_ATTACH_NO_CONNECTOR); -} - -static const struct drm_bridge_funcs qmp_combo_bridge_funcs = { - .attach = qmp_combo_bridge_attach, -}; - -static int qmp_combo_dp_register_bridge(struct qmp_combo *qmp) -{ - qmp->bridge.funcs = &qmp_combo_bridge_funcs; - qmp->bridge.of_node = qmp->dev->of_node; - - return devm_drm_bridge_add(qmp->dev, &qmp->bridge); -} -#else -static int qmp_combo_dp_register_bridge(struct qmp_combo *qmp) -{ - return 0; -} -#endif - static int qmp_combo_parse_dt_lecacy_dp(struct qmp_combo *qmp, struct device_node *np) { struct device *dev = qmp->dev; @@ -3436,7 +3396,7 @@ static int qmp_combo_probe(struct platform_device *pdev) if (ret) return ret; - ret = qmp_combo_dp_register_bridge(qmp); + ret = drm_simple_bridge_register(dev); if (ret) return ret;