From patchwork Tue Feb 20 11:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13563932 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34629C48BC4 for ; Tue, 20 Feb 2024 11:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=njvz9WCSkMK8eQs9i9OZxPeJ8+mqda++xakFP81Br44=; b=06U0szj6Qsnj77 Cnlw4qDcdtVjwPfykUn2i50jXeYSkbONCABa4VtXzYEpymN90z/Gj42dj3+URQJV8LKRAwdqPrCBb 417Pv9RqEUUXdSlEC+QQjd7hLCQPN8/EcPRMNcMfCwKKlw66UIoDZcTVZz6+l4PLesXh4ps1TvrjX ORlmaiNn6RPj0uCrp6M8NgFHoCMQzb4lAMy9k/J2yL3/V5RGa8gf+ZvJcWcsoUvH5SCYsqcMmm9Og 9nKmZHsP870lhnhDqQdjm8+NOkI7Da0MF6mciMJ1OTf06DPDCvQBPl1UhCn8RbwPbxlKwrHJ1NIeb cr3gtJaMjEEUW+MDZ6vA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcOlW-0000000EZLz-3XRM; Tue, 20 Feb 2024 11:58:26 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcOlT-0000000EZJ9-1yuW for linux-phy@lists.infradead.org; Tue, 20 Feb 2024 11:58:24 +0000 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a293f2280c7so754992466b.1 for ; Tue, 20 Feb 2024 03:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708430301; x=1709035101; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PGRRI7sgcjcdwbFUQNyGAZlpRlxjS+UkjJwbRkuNFeY=; b=kIDR6WoTe4hRqn//q8sHo7mRF3ZsgrtaT47oiNNYgLZc0Ppwczys9rjASXl5UgxjzD taO8jE5KZyz3NKW4bi5CEf5bKDPRoQ9yly9ZjwkEUYzO9E71YlGbdG7+UUM55gU16Gpw 3AHWP5lwlJH0zO3Jn1/faeXr7qNcA3JIwbot9Fo2zSQ+6t32jZDy5kZ0qqrbb/ilkyBR kJbka4ChHskb3Ej5ypsSOBXNrsQXV+VqvITYwGjEIcM1mc8pxkvnT/4VSNcie7r16+fH 4qIbRi+fc/1buP2GEK3mqldjl3YXM9Lt+3omeU56jaK+AEO9STs0mxYl6c/r7mlIbqRF 0pfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708430301; x=1709035101; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PGRRI7sgcjcdwbFUQNyGAZlpRlxjS+UkjJwbRkuNFeY=; b=FQqJBY8MRAJMuzZIzkXPekQ0i4ReHwxhMY7qMCAHyAnZ46FDrTl5UoQaFGjDbQ0fvk hL1rY7CjFBqEMt5e1AF2FmLPT7i3ymc2Jsq69Xt3cgatyK9hFCa/fasUCGraAMOu8zpy ysZlC7NCjs0VBg4QRm6iDIYliXIY9LQJE0c13V9W/zvyI1afvCgPo3W277x4MqLcZlNT 84UuFVsisNW1gqERd5bK+rHvJHxHHKgS05dnkHerzKrucLq18zdcdmBIE00qGH3KGdZI 4sU8SXoBniiDDbNCZuZq2Lg3gOrWN/qUn0nqWemZ5G6FdDjXtYXwZo0i1AjT7AAdabXr Ui9g== X-Gm-Message-State: AOJu0Yx32YrlaZXb0Y2k8lhqlxYCW42SxmH+ekoxfF2jfc8nLvUfLi3Q ONZS/GQO5TYKjslkostTdQV9cdBT6b0QD+8EUaoEMT7ui9PGh03OX+qNE1lQ5jM= X-Google-Smtp-Source: AGHT+IG6L9xITCJVEiQBoTj22ayoiRJ3t/ISu3A7dOxIVnGYgRVfQE2D4obV3JcBaBSb1tXFQV+COA== X-Received: by 2002:a17:906:a3ce:b0:a3e:dcd2:2741 with SMTP id ca14-20020a170906a3ce00b00a3edcd22741mr2098953ejb.38.1708430301682; Tue, 20 Feb 2024 03:58:21 -0800 (PST) Received: from [127.0.1.1] ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id hu11-20020a170907a08b00b00a3e0b6ea9fdsm3806200ejc.26.2024.02.20.03.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 03:58:21 -0800 (PST) From: Abel Vesa Date: Tue, 20 Feb 2024 13:58:11 +0200 Subject: [PATCH v5 2/2] phy: qcom: edp: Add set_mode op for configuring eDP/DP submode MIME-Version: 1.0 Message-Id: <20240220-x1e80100-phy-edp-compatible-refactor-v5-2-e8658adf5461@linaro.org> References: <20240220-x1e80100-phy-edp-compatible-refactor-v5-0-e8658adf5461@linaro.org> In-Reply-To: <20240220-x1e80100-phy-edp-compatible-refactor-v5-0-e8658adf5461@linaro.org> To: Vinod Koul , Kishon Vijay Abraham I , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov , Johan Hovold Cc: linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Abel Vesa X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7178; i=abel.vesa@linaro.org; h=from:subject:message-id; bh=x/sM1oxfZUCPHoOMyY6oHfzmE1AvTxeArqfwZBquDmQ=; b=owEBbQKS/ZANAwAKARtfRMkAlRVWAcsmYgBl1JPYk+p/zoBgxugVQLpGoraWbEN1QX0W7NEyO xRsgeAZnVaJAjMEAAEKAB0WIQRO8+4RTnqPKsqn0bgbX0TJAJUVVgUCZdST2AAKCRAbX0TJAJUV VvsSD/9hloADRQYU7tnQdewIv7Hb1js3HM1CzKqj/vShuTTSZvB74QLhKj6dA2VjLzNtMSQytnx Wjx6fkkbinwLLb1UKA4S2RbRmNRkrlsFAIieH2mAW1nm4fLkxBd3rh79zZkdO/i0H/jgMja3fAQ bWfLZEJwhnZZTMvi3+ZwDz92zQXbRvufL5sMTAyZDOJyUMeOt1VUyBKulHATrofDA2OLAhhdpnl PhBoiE6rp/U/lf61dUfktVjxBJIZUxZ6xr3rqb37IYgoNV6Uu9ByXhGjkKkxoqcm4nDtwDnhlYS +1PYpCH4hvJfRrwr+xCvtUO4t2da1AcEGPNnMePC/aeRtgh7wJQILG60AFudgE2pAmRN7fuKib5 KZ9Kc05muNT02QLPUDOBZ8J1e+LLA5VFJl0U0yf+WbERoi+MBZKD9DeayMS2MDuo87JZsBMPQkw Wxq1r5eAFgc1V9cimU9jAhFrglf/9sCADaZoE+CKOSiuo4w6eWhPLC/8wKl0Nn2nRKFQJ9lRu64 DQSW2Iw5gakJzMEFOS5TTzjI2SxSVfpDH7JuqhcZRHDCSh1+IA/I1CMZp2C5YTnbjpq/wqN+miC yL7jPA2NJBh7xR4127Xl7f5WWK15TwOG4/RWux0hmRsOA6oc2TLGU+JBozac1vWUr8j+/70xtkp DZxVWWqoip8o7Pw== X-Developer-Key: i=abel.vesa@linaro.org; a=openpgp; fpr=6AFF162D57F4223A8770EF5AF7BF214136F41FAE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_035823_675699_26B5CB39 X-CRM114-Status: GOOD ( 22.22 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Future platforms should not use different compatibles to differentiate between eDP and DP mode. Instead, they should use a single compatible as the IP block is the same. It will be the job of the controller to set the submode of the PHY accordingly. The existing platforms will remain with separate compatibles for each mode. Signed-off-by: Abel Vesa Reviewed-by: Dmitry Baryshkov --- drivers/phy/qualcomm/phy-qcom-edp.c | 76 +++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-edp.c b/drivers/phy/qualcomm/phy-qcom-edp.c index 9818d994c68b..621d0453bf76 100644 --- a/drivers/phy/qualcomm/phy-qcom-edp.c +++ b/drivers/phy/qualcomm/phy-qcom-edp.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -69,19 +70,21 @@ #define TXn_TRAN_DRVR_EMP_EN 0x0078 -struct qcom_edp_cfg { - bool is_dp; - - /* DP PHY swing and pre_emphasis tables */ +struct qcom_edp_swing_pre_emph_cfg { const u8 (*swing_hbr_rbr)[4][4]; const u8 (*swing_hbr3_hbr2)[4][4]; const u8 (*pre_emphasis_hbr_rbr)[4][4]; const u8 (*pre_emphasis_hbr3_hbr2)[4][4]; }; +struct qcom_edp_phy_cfg { + bool is_edp; + const struct qcom_edp_swing_pre_emph_cfg *swing_pre_emph_cfg; +}; + struct qcom_edp { struct device *dev; - const struct qcom_edp_cfg *cfg; + const struct qcom_edp_phy_cfg *cfg; struct phy *phy; @@ -97,6 +100,8 @@ struct qcom_edp { struct clk_bulk_data clks[2]; struct regulator_bulk_data supplies[2]; + + bool is_edp; }; static const u8 dp_swing_hbr_rbr[4][4] = { @@ -127,8 +132,7 @@ static const u8 dp_pre_emp_hbr2_hbr3[4][4] = { { 0x04, 0xff, 0xff, 0xff } }; -static const struct qcom_edp_cfg dp_phy_cfg = { - .is_dp = true, +static const struct qcom_edp_swing_pre_emph_cfg dp_phy_swing_pre_emph_cfg = { .swing_hbr_rbr = &dp_swing_hbr_rbr, .swing_hbr3_hbr2 = &dp_swing_hbr2_hbr3, .pre_emphasis_hbr_rbr = &dp_pre_emp_hbr_rbr, @@ -163,18 +167,28 @@ static const u8 edp_pre_emp_hbr2_hbr3[4][4] = { { 0x00, 0xff, 0xff, 0xff } }; -static const struct qcom_edp_cfg edp_phy_cfg = { - .is_dp = false, +static const struct qcom_edp_swing_pre_emph_cfg edp_phy_swing_pre_emph_cfg = { .swing_hbr_rbr = &edp_swing_hbr_rbr, .swing_hbr3_hbr2 = &edp_swing_hbr2_hbr3, .pre_emphasis_hbr_rbr = &edp_pre_emp_hbr_rbr, .pre_emphasis_hbr3_hbr2 = &edp_pre_emp_hbr2_hbr3, }; +static const struct qcom_edp_phy_cfg sc7280_dp_phy_cfg = { +}; + +static const struct qcom_edp_phy_cfg sc8280xp_dp_phy_cfg = { + .swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg, +}; + +static const struct qcom_edp_phy_cfg sc8280xp_edp_phy_cfg = { + .is_edp = true, + .swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg, +}; + static int qcom_edp_phy_init(struct phy *phy) { struct qcom_edp *edp = phy_get_drvdata(phy); - const struct qcom_edp_cfg *cfg = edp->cfg; int ret; u8 cfg8; @@ -201,7 +215,12 @@ static int qcom_edp_phy_init(struct phy *phy) DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN, edp->edp + DP_PHY_PD_CTL); - if (cfg && cfg->is_dp) + /* + * TODO: Re-work the conditions around setting the cfg8 value + * when more information becomes available about why this is + * even needed. + */ + if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp) cfg8 = 0xb7; else cfg8 = 0x37; @@ -235,7 +254,7 @@ static int qcom_edp_phy_init(struct phy *phy) static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configure_opts_dp *dp_opts) { - const struct qcom_edp_cfg *cfg = edp->cfg; + const struct qcom_edp_swing_pre_emph_cfg *cfg = edp->cfg->swing_pre_emph_cfg; unsigned int v_level = 0; unsigned int p_level = 0; u8 ldo_config; @@ -246,6 +265,9 @@ static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configur if (!cfg) return 0; + if (edp->is_edp) + cfg = &edp_phy_swing_pre_emph_cfg; + for (i = 0; i < dp_opts->lanes; i++) { v_level = max(v_level, dp_opts->voltage[i]); p_level = max(p_level, dp_opts->pre[i]); @@ -262,7 +284,7 @@ static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configur if (swing == 0xff || emph == 0xff) return -EINVAL; - ldo_config = (cfg && cfg->is_dp) ? 0x1 : 0x0; + ldo_config = edp->is_edp ? 0x0 : 0x1; writel(ldo_config, edp->tx0 + TXn_LDO_CONFIG); writel(swing, edp->tx0 + TXn_TX_DRV_LVL); @@ -448,10 +470,9 @@ static int qcom_edp_set_vco_div(const struct qcom_edp *edp, unsigned long *pixel static int qcom_edp_phy_power_on(struct phy *phy) { const struct qcom_edp *edp = phy_get_drvdata(phy); - const struct qcom_edp_cfg *cfg = edp->cfg; u32 bias0_en, drvr0_en, bias1_en, drvr1_en; unsigned long pixel_freq; - u8 ldo_config; + u8 ldo_config = 0x0; int timeout; int ret; u32 val; @@ -469,7 +490,8 @@ static int qcom_edp_phy_power_on(struct phy *phy) return timeout; - ldo_config = (cfg && cfg->is_dp) ? 0x1 : 0x0; + if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp) + ldo_config = 0x1; writel(ldo_config, edp->tx0 + TXn_LDO_CONFIG); writel(ldo_config, edp->tx1 + TXn_LDO_CONFIG); @@ -590,6 +612,18 @@ static int qcom_edp_phy_power_off(struct phy *phy) return 0; } +static int qcom_edp_phy_set_mode(struct phy *phy, enum phy_mode mode, int submode) +{ + struct qcom_edp *edp = phy_get_drvdata(phy); + + if (mode != PHY_MODE_DP) + return -EINVAL; + + edp->is_edp = submode == PHY_SUBMODE_EDP; + + return 0; +} + static int qcom_edp_phy_exit(struct phy *phy) { struct qcom_edp *edp = phy_get_drvdata(phy); @@ -605,6 +639,7 @@ static const struct phy_ops qcom_edp_ops = { .configure = qcom_edp_phy_configure, .power_on = qcom_edp_phy_power_on, .power_off = qcom_edp_phy_power_off, + .set_mode = qcom_edp_phy_set_mode, .exit = qcom_edp_phy_exit, .owner = THIS_MODULE, }; @@ -782,6 +817,7 @@ static int qcom_edp_phy_probe(struct platform_device *pdev) edp->dev = dev; edp->cfg = of_device_get_match_data(&pdev->dev); + edp->is_edp = edp->cfg->is_edp; edp->edp = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(edp->edp)) @@ -840,10 +876,10 @@ static int qcom_edp_phy_probe(struct platform_device *pdev) } static const struct of_device_id qcom_edp_phy_match_table[] = { - { .compatible = "qcom,sc7280-edp-phy" }, - { .compatible = "qcom,sc8180x-edp-phy" }, - { .compatible = "qcom,sc8280xp-dp-phy", .data = &dp_phy_cfg }, - { .compatible = "qcom,sc8280xp-edp-phy", .data = &edp_phy_cfg }, + { .compatible = "qcom,sc7280-edp-phy", .data = &sc7280_dp_phy_cfg, }, + { .compatible = "qcom,sc8180x-edp-phy", .data = &sc7280_dp_phy_cfg, }, + { .compatible = "qcom,sc8280xp-dp-phy", .data = &sc8280xp_dp_phy_cfg, }, + { .compatible = "qcom,sc8280xp-edp-phy", .data = &sc8280xp_edp_phy_cfg, }, { } }; MODULE_DEVICE_TABLE(of, qcom_edp_phy_match_table);