From patchwork Thu Jun 1 09:52:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 687824 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 BF132C7EE2A for ; Thu, 1 Jun 2023 09:52:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232354AbjFAJwp (ORCPT ); Thu, 1 Jun 2023 05:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233126AbjFAJwh (ORCPT ); Thu, 1 Jun 2023 05:52:37 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EFD71AE for ; Thu, 1 Jun 2023 02:52:30 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-30aef0b8837so589122f8f.1 for ; Thu, 01 Jun 2023 02:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685613149; x=1688205149; 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=8attWh5blvnbK1LTsKzAzIPWfugB8bqZKE5rCB1mH2E=; b=WMBGwlX/O8yvrJIcjOaJA5LTwFL5xJM1kY0E7juWli5+RbvtRVvKGa3nxk4PzKmtq1 qEWjRNIqJIeu+J0b9WulCuXfuaAju5RQ/V+Q9ot39V0HuSW1dgk6vyqhkS8KTV0Uc13f PS/qpka1R6ODmKblm1HQNxHrATX4+ns2ooNCyMvAVIggMdhfCrPjHjAvTJXicabH2/8J U6UtmkJYshzk0pWg8dpQd84ok0ITwyI01uYFiL3xmnff6FQd/1jYH1ipEhvvWmFWquKq jPJXcAZZIn4reSOWzBQK6k2j56widPKIBxuzkhnfrR5LQmxHOuJLCgFmGyI3C1IOtFbO OpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685613149; x=1688205149; 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=8attWh5blvnbK1LTsKzAzIPWfugB8bqZKE5rCB1mH2E=; b=Nr+OBjvECEKiEG94ThSiOqGlxCP6CU+5Z3XjlKCpBbxn2NBXAgny++tUaTgDMxgi+R rFImkAD+RkXpDLmsKxhWDdXtqADWNYOg+TeysRiZZz/RbWPf/L/o8vFYfqs/dy9Idv4i 1WRRoCz0tb+LE3ev4tH/Do7nemdyZKJFpAkF0LrRbH5cL5jP+aDeiU3TFJOK63AQQFdC VSU+Qror2fUfSCTdICvM9kT9HYUH2y6ZjVfEAVKowtNH0G2ekQrV8FrxA3GE2hztZ2lh 6KhpiPI84JTXx+b2V5CYdBcD+B2fS9zgQkrXvKNQVVgqZbEbVeSNA+I48U2ikixwTama eDSA== X-Gm-Message-State: AC+VfDwSM3cA/dLMLfWL3jT9gqPiKbJVdUT4a/T5wlTpPVV8S4z/iSWE f+yH4jlEhemhiUlpOTcUyqmA8A== X-Google-Smtp-Source: ACHHUZ5Uwli8lIE4aUP29QdpJvFFOhoFA838PaUoUut8+Zvx5HXYE0KDra2r/45aiutnlBy2iQn2og== X-Received: by 2002:adf:ee8e:0:b0:2f5:930:39b1 with SMTP id b14-20020adfee8e000000b002f5093039b1mr1388308wro.38.1685613148927; Thu, 01 Jun 2023 02:52:28 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id z9-20020a5d4409000000b0030af05fce4dsm9746150wrq.77.2023.06.01.02.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 02:52:28 -0700 (PDT) From: Neil Armstrong Date: Thu, 01 Jun 2023 11:52:24 +0200 Subject: [PATCH 1/2] dt-bindings: display: msm: dp-controller: document SM8550 compatible MIME-Version: 1.0 Message-Id: <20230601-topic-sm8550-upstream-dp-v1-1-29efe2689553@linaro.org> References: <20230601-topic-sm8550-upstream-dp-v1-0-29efe2689553@linaro.org> In-Reply-To: <20230601-topic-sm8550-upstream-dp-v1-0-29efe2689553@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kuogee Hsieh , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=812; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=xZLag6FJYjzac0Af/641OR1LVZQQZ3vGR7dxiu2wW2k=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkeGpZO1zfPVuPaj5xJCI/YaYWnipNbGY/zOZsKGD/ 6dwpMOWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZHhqWQAKCRB33NvayMhJ0elbEA C9slU97TnvSWLFECu3STmbQT68/hUCOfKfs1km6yvrBOEs6xxoE/WVz3Syv5lj/O01R+C2+BiNkumd WXvpwT3N3PX7DuTboZskNyXFt3hP78gsIKl+KNxe3TpWcggLJb91nYcBvf8eLkUrD903FSsP+bU8sb paOyFG8U0raryciPLMEaNeYiroQuMiYywfGIP6ZBV2CKE2JDPQd5BGD2ocRjZUjsNMLP2siQ4yXaHI +Ge3j9TLUDz88oIl21p5+AoZ2zQmMNAE3CvzuQ5OWj/FHd74jhc6Q8wnT+MPrKfzpQRTjKzlFfjM/h XTEi/a3G6H1S/nYGyqkgwZCV1MTqY6QRkHI9XYGxQohm1JdpviWkXQoFGCG0epxnrZhAUYG5f74/fy JH7GIehs5OhwOBggl1uFjGDDqVGvlbr+bAMVXFIH4B9BmSh7hY2wrwhh9Qwhexj2ZeVmsQB8JgBN8Z xJt3vi6/k5XvH8tUsM7EMePECXOLLAuuXbwn0nFwIETBIQDqncVVWO3+u1gu23e64AWmm3bOeETC41 3Q3LBV1lBG4YoCmY8eKJSZ6GvERyAjFD35LKm2Hcljsh0JkDI44pMlV4w01293i3VEmRQr7LmvmMzS MeVzMwr5OSkeWjbKtD3Hxcs7wYy53kyDs9kcWRT/5Y2JHFNMuHeb6mOb+wsw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The SM8550 & SM8350 SoC shares the same DP TX IP version, use the SM8350 compatible as fallback for SM8550. Signed-off-by: Neil Armstrong Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/display/msm/dp-controller.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml index f0c2237d5f82..7a7cf3fb3e6d 100644 --- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml +++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml @@ -29,6 +29,7 @@ properties: - items: - enum: - qcom,sm8450-dp + - qcom,sm8550-dp - const: qcom,sm8350-dp reg: From patchwork Thu Jun 1 09:52:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 689445 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 91812C77B7E for ; Thu, 1 Jun 2023 09:53:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233113AbjFAJxS (ORCPT ); Thu, 1 Jun 2023 05:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233105AbjFAJwl (ORCPT ); Thu, 1 Jun 2023 05:52:41 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D0BEE40 for ; Thu, 1 Jun 2023 02:52:31 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-30ae967ef74so609512f8f.0 for ; Thu, 01 Jun 2023 02:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685613150; x=1688205150; 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=f3x3X1a6G/OXzIQ0e/FqTCoMI/OSYIjl1tXgiqm7Ko4=; b=rhHBsl4aHuNPRZ0hMiQGwtISYhhMW8fTHTkDjOzw3xYr3alyt9MdZisj0AKjTnvo0T +dfg3yY1HTUp+9hbHtQcb+Cdw47O/Gf6AJg4JiokGTAHAy4jTfwhOOGOf8kCbvAQrPPi OYTehTkem4FJDcct+RdeS9+/DoK0id6lQQBiOcRKb5gXjPWgT/vwAlB9LwEM8Q5lBwI4 8L3wUONjMq5Cy9g8CixtjAyu/4jxDDdAr0XzH2jKruRsUjdEfeAfFpLRSvlhUBREt18Y +B2ZvV52avxweS6YpbsoUK+VtPrMQlYN/4CnfxE8oh5EsUR4jcAMu3m+Zn8P9Yw6mmKg RfoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685613150; x=1688205150; 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=f3x3X1a6G/OXzIQ0e/FqTCoMI/OSYIjl1tXgiqm7Ko4=; b=OJgkwWwPO7rc3XLk11zW+FnqGGNNK749yYGJcYMLdJRJf4MObjd9NvwOi73rAQ3D4F TVmnQrWwvbQZk4NBqCygdY4WJxdVNwlsnn774YGmhUvNj8xwYXso9Ex3NQWoybujUbO3 q4aEiSOoqBG61UGiDz3TkVvbXBjoWdyAb/T7C1cwJ9Q9jO8KifQ1pM5kw+N9vp0Y7Fng +EIwqNGErKpZD1khDZeOT9O/hNZi6qxy+R6j7R7ntCsB0dKoW0ixsSrxzgfzT9AZHlBV OZ4gadKBlFqldJdQdLx7k/ALikjiKrsQPW+tEvTArhSdeWidLTvXwhqA7jpdAjeloYj6 w0RA== X-Gm-Message-State: AC+VfDzNTw2JRSjV6FE1SWmJBq8C1qP7y+V8+qdVDRe+ozOjJr6wMOe/ cQ/GMXSEZwuKxQ9fCNBogbe9S/7WWIuvChELmOffKg== X-Google-Smtp-Source: ACHHUZ5IhJO0KYcgAiScAvGIMpuDsyLi/N2TEMPPa8jf751U1IW27j+pcLdDb7aCna7bRKxQIdbnOA== X-Received: by 2002:adf:f889:0:b0:30a:8995:1dc3 with SMTP id u9-20020adff889000000b0030a89951dc3mr1557912wrp.55.1685613149941; Thu, 01 Jun 2023 02:52:29 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id z9-20020a5d4409000000b0030af05fce4dsm9746150wrq.77.2023.06.01.02.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 02:52:29 -0700 (PDT) From: Neil Armstrong Date: Thu, 01 Jun 2023 11:52:25 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: sm8550: add display port nodes MIME-Version: 1.0 Message-Id: <20230601-topic-sm8550-upstream-dp-v1-2-29efe2689553@linaro.org> References: <20230601-topic-sm8550-upstream-dp-v1-0-29efe2689553@linaro.org> In-Reply-To: <20230601-topic-sm8550-upstream-dp-v1-0-29efe2689553@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kuogee Hsieh , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3408; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=cvd2h/OWSMxMDDXBFiERp/JEl76MczzHyDyFFv+rQt0=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkeGpaZtWnWx1bo0rdtB7RwCFqrWYDLPW8gPo5NL4Y OvsL3MGJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZHhqWgAKCRB33NvayMhJ0e69D/ 9iYcEacMHsbMOoEAi+SVu6RR4UmqrZ6kI78xsolG7sfpwsvnsnumEKCKeLjdBN8JWD5lRuiFusrIcE P7mlIYtlKX1WiX4PUeALfqVdqnzWXKJ+oMhxsDbMFS+lDEEmFUB+yGLghdnwv6ZV6aFPyFpYmH0GFn Py3+ZZf5fJJ2i3PmIFqK8nFnMRG/hwCWtYW1gk3FqKboov7vahJMCXq69sFi0WrC1giJsr7nmsVN3G Ap8r0CfjqLBh5GL6h+eKXGVaT2MPTCg093zweykIS87lBEPP1RBlbOZAW+6UMNGhUbHWtILxLOPmsV 2iYIpvA8rSjEieVH0fIN2P1Hp2s4hWRIOVq2oCz4GnI4tNC54j+Kq5S45p3QjcnnPnjXRMU+B6WJQn FlFai94wxI/QZ3qNXPTOeSn5hXyFeppxsMRFp1vK6CivgBYypRUiB3T0wkhX2FKY6hZiV96MGTZUFf ghCnFBIAVzfQHJvITFmuwamTEzpfh/vs4JY6dFVCGwM4UMq8sYTJreJcZGkQhWBAMuFKw8Hb/kGj8W IEqpNxKd3++q9nODh1irCIZtmtFFkZQKfWtHgMf2btUe51jmUP2LronKP/+OjY6h1OWUX1uhSdjdRT i4vRb8qPW/OMwJjoRVQQI2IJZ7DX72khRrbx0lGah8ABYMUhwDX8qyzeiJ4g== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the Display Port controller subnode to the MDSS node. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 89 +++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 75cd374943eb..73524afc2e3a 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2495,6 +2495,13 @@ dpu_intf2_out: endpoint { remote-endpoint = <&mdss_dsi1_in>; }; }; + + port@2 { + reg = <2>; + dpu_intf0_out: endpoint { + remote-endpoint = <&mdss_dp0_in>; + }; + }; }; mdp_opp_table: opp-table { @@ -2522,6 +2529,84 @@ opp-514000000 { }; }; + mdss_dp0: displayport-controller@ae90000 { + compatible = "qcom,sm8550-dp", "qcom,sm8350-dp"; + reg = <0 0xae90000 0 0x200>, + <0 0xae90200 0 0x200>, + <0 0xae90400 0 0xc00>, + <0 0xae91000 0 0x400>, + <0 0xae91400 0 0x400>; + interrupt-parent = <&mdss>; + interrupts = <12>; + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_AUX_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_LINK_INTF_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK>; + clock-names = "core_iface", + "core_aux", + "ctrl_link", + "ctrl_link_iface", + "stream_pixel"; + + assigned-clocks = <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK_SRC>, + <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC>; + assigned-clock-parents = <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + + phys = <&usb_dp_qmpphy QMP_USB43DP_DP_PHY>; + phy-names = "dp"; + + #sound-dai-cells = <0>; + + operating-points-v2 = <&dp_opp_table>; + power-domains = <&rpmhpd SM8550_CX>; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + mdss_dp0_in: endpoint { + remote-endpoint = <&dpu_intf0_out>; + }; + }; + + port@1 { + reg = <1>; + mdss_dp0_out: endpoint { + }; + }; + }; + + dp_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-162000000 { + opp-hz = /bits/ 64 <162000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-270000000 { + opp-hz = /bits/ 64 <270000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-540000000 { + opp-hz = /bits/ 64 <540000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-810000000 { + opp-hz = /bits/ 64 <810000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + }; + mdss_dsi0: dsi@ae94000 { compatible = "qcom,sm8550-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae94000 0 0x400>; @@ -2705,8 +2790,8 @@ dispcc: clock-controller@af00000 { <&mdss_dsi0_phy 1>, <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>, - <0>, /* dp0 */ - <0>, + <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>, <0>, /* dp1 */ <0>, <0>, /* dp2 */