From patchwork Fri Mar 17 09:12:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp231646wrt; Fri, 17 Mar 2023 02:16:05 -0700 (PDT) X-Google-Smtp-Source: AK7set8QCUb79wJpXGnaY8roguaiRfFor7Jt3n6YnKzPEKn2yqi4NV74Zufew8Gww1qda9Li8TM9 X-Received: by 2002:a05:6a20:7f8c:b0:d7:3c1a:6caf with SMTP id d12-20020a056a207f8c00b000d73c1a6cafmr4563140pzj.2.1679044565229; Fri, 17 Mar 2023 02:16:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679044565; cv=none; d=google.com; s=arc-20160816; b=sxphKb6KJ+LUShAa4Q2TQEIuOux3gujjv5zYeKZrWoNJ1unPGeEqu13r01Lvg4WaVf yg/ciJefx38v8+YQqEFsGJ+b5Kg3s0lvrJSZzCQ+rExZhBgDoR3N9KAnkY/58HKh6noI QW/uU2BLMLjFG+4r2w3Xd+vT1YgAHfcif1nYm/dAn0YGUsXAy74Nkw+9WKE9umDqMity XwpSUBDEoWDu++2acTJEgF4HjkPOccM7H9pYw2sCAtxPtiheqvAz2iCLlmWg97eAGTuD vuZtoEBy26/05prQzOzNnHGMFzjet98y9NDlkBjHDvqLkiVGSMuKV30qYQf3GJyVLwzl YVCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=PBcGm9IzqWfmksEDhkD68OpL5s1KaoBkDeTtWamSELM=; b=kDEcSbHfDTvSaP5/sAo4BGYyVwTmU7m/MgAKj4J0yXCLs3EH2P6qnaEo7+whpF8OX9 b/4uTRTXdZnwwrLJTzqvwl6iJt4bXJ0DEtBD+/5PnyLwd5Fu6zSrlYBiprXTAGxuVs0u unkVvsLthUvTUPHqJboV56ky2Nlxt03757xAV7PvZoz+7nZ4wjKSVkhgExmkiMwvjfUm k9c328QfEG+zpHG8my+oSZg7gmz0Ua0UX4OlxaAp421q+RuQj4mWpwuQUwoYHknZBd7a uGm4aEbncTxXoEDeipWATKgfb6a19BViRHD5rbohb9oozHXU2hLy6AsO1HgTeJnfdWtj W8fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g6f9A8Z0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x24-20020a63db58000000b005030009496asi1834753pgi.34.2023.03.17.02.15.52; Fri, 17 Mar 2023 02:16:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g6f9A8Z0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229962AbjCQJM6 (ORCPT + 99 others); Fri, 17 Mar 2023 05:12:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbjCQJMy (ORCPT ); Fri, 17 Mar 2023 05:12:54 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C84B91259C for ; Fri, 17 Mar 2023 02:12:52 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id t15so3766250wrz.7 for ; Fri, 17 Mar 2023 02:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679044370; 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=PBcGm9IzqWfmksEDhkD68OpL5s1KaoBkDeTtWamSELM=; b=g6f9A8Z0wJQ7Liw9kDKgGq/YiHncZo9u6nd7/engs7YVkj+Eemzz4Xwm/b4cN92z2J r/p6tGJgs9BoUElT3eD04ah8tRmms2MukhdzZ/vH/lghf2jGOVkfgW5+kI4GikQGIAGq 7jYRuIiAU7Ld6Axs4QM7OSF5cxEWwiuimJOx2+D50mP7mgnUAmEsR/J1W2YS3veWeiSw eYE9Bgd0KSEdHrfk7C+eDPTeTLYyIjDz0HIAW59ox8QAtq5ZF3PO1VP8VbmcPK2dOdA4 a8bAJsQHKq5QoUyJ7y0tvSUG+6+Cyl1vpltoawUKUXt9MqUY+8bhCbbN7m8PgG+wXRF7 FPsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679044370; 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=PBcGm9IzqWfmksEDhkD68OpL5s1KaoBkDeTtWamSELM=; b=35Q9GDg7r8xjEXz+nrCv5SBpZn2alCh1+JVgKLx4jCdAQTxiebu7lr9cnNvBgnFImp pFomvW9ki6TaqckW71Vi5TDbOzW9UjAWu38O1ARt/GzqDtrDrYpn7r0N45Dp5guTLusu G+KLNts6TjEX8KF+jcidFJ2+Cuzvgwa+7WpAQIaUlq1LnFXjmTCfQnFhlQefUGnlgIPC P2C5iAAa3+2PPoGsVt7XhkR5IwxNdFe6ARsa3fuBZX9BhjqNS/v1V5Pv2oUDkWHFZu9H peCy+UTIH7bhlaT4e+8C68DimI/3wZT7zSQoiN48+iLqrmsegxTldsIw3qZ/MbeOVhpQ 9VwA== X-Gm-Message-State: AO0yUKULl1I0LYKTeFjWzo0K5ifPdQgVloj6l5OHludWQqjXrz05hJ9s 13XwNNJ41NwV5MeBoh+GW3zVfg== X-Received: by 2002:a5d:56c8:0:b0:2cf:ebaa:31a0 with SMTP id m8-20020a5d56c8000000b002cfebaa31a0mr6910090wrw.54.1679044370487; Fri, 17 Mar 2023 02:12:50 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id j10-20020a5d464a000000b002cea8f07813sm1467976wrs.81.2023.03.17.02.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 02:12:50 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 10:12:47 +0100 Subject: [PATCH v5 1/5] dt-bindings: display: msm: dp-controller: document SM8450 compatible MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v5-1-a27f1b26ebe8@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , 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 , Krzysztof Kozlowski X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760605834275195435?= X-GMAIL-MSGID: =?utf-8?q?1760605834275195435?= The SM8450 & SM350 shares the same DT TX IP version, use the SM8350 compatible as fallback for SM8450. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- .../bindings/display/msm/dp-controller.yaml | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml index 0e8d8df686dc..f0c2237d5f82 100644 --- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml +++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml @@ -15,16 +15,21 @@ description: | properties: compatible: - enum: - - qcom,sc7180-dp - - qcom,sc7280-dp - - qcom,sc7280-edp - - qcom,sc8180x-dp - - qcom,sc8180x-edp - - qcom,sc8280xp-dp - - qcom,sc8280xp-edp - - qcom,sdm845-dp - - qcom,sm8350-dp + oneOf: + - enum: + - qcom,sc7180-dp + - qcom,sc7280-dp + - qcom,sc7280-edp + - qcom,sc8180x-dp + - qcom,sc8180x-edp + - qcom,sc8280xp-dp + - qcom,sc8280xp-edp + - qcom,sdm845-dp + - qcom,sm8350-dp + - items: + - enum: + - qcom,sm8450-dp + - const: qcom,sm8350-dp reg: minItems: 4 From patchwork Fri Mar 17 09:12:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp231609wrt; Fri, 17 Mar 2023 02:16:01 -0700 (PDT) X-Google-Smtp-Source: AK7set8wvsWYpgJPSLB3v5/BBcZGa8uTfgs9NqUg1debfEEgH5+iIJgoaG2+Cdw7vvKNcMaR6bdH X-Received: by 2002:a05:6a20:7f8e:b0:d5:58df:fb94 with SMTP id d14-20020a056a207f8e00b000d558dffb94mr7232508pzj.2.1679044561181; Fri, 17 Mar 2023 02:16:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679044561; cv=none; d=google.com; s=arc-20160816; b=b6cpuuribwGHAmMlocBvEznSA71Fqk/1HaeYXAmGhaTWisfpqjVKwQh1mP2seb2KUQ I2EBhJbAWmmlULs9tMpsjEhOMdbpzFpcGbaE0jDdpOtRAbai4gs2KIQHejA1zOhqZBy1 UMeTy78QrBKKUxlWmNYHYHfwhu8k9s7oE4yGhZ6zC+XSM4hsSaIVAPScm4Av76/vJkCj 6daUduT/wrbDhKlqGucBGmN7U0g6O88O4o8MnUaItMdmJzZJbp/bmdyACCL7ay2t0aG8 Z+Z+92DirupEIEjHX6A1BafqfTEuc6pIh5TFF33uXFfoyHkSjjNKKZAbo34sXns64kF9 pm0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=Iz+q4J9D8vW99ZdOFeiv0n++iGRRXy+d4O00jW2AsFocwAbHF9dqY7RfcQPC3HxZFV CZTzpjPSbOeyrsxiQu2b1pSHx7PUgl9vkQ2CiSggIhW2H4SHzff9mUtynOYTHKhziV0U uUv+mtNQmiOL0kmoE7/Ukf4oQLBRsWsEulAmRo1PmenX6TpQsl8lE2vXhXfAFYS6uo9G rGqYHOUjMP2AF6iSWZaL/QO9Yl43wVC0o0pwuVAd8qVcuuJBwEypnodVo1+wUHIvFF6Z iQgIb9ME4RF37CTb+QDsoEVwCWBe169n4wjo2dL9fH7b+qZrCBTeocxKzqyuZW1GK+8u HCFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xy+FuwJC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cn15-20020a056a00340f00b0058d9266a507si927300pfb.376.2023.03.17.02.15.48; Fri, 17 Mar 2023 02:16:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xy+FuwJC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231168AbjCQJNB (ORCPT + 99 others); Fri, 17 Mar 2023 05:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230314AbjCQJM4 (ORCPT ); Fri, 17 Mar 2023 05:12:56 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 019F516AF8 for ; Fri, 17 Mar 2023 02:12:52 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id q16so3779747wrw.2 for ; Fri, 17 Mar 2023 02:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679044371; 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=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=xy+FuwJCeV5BHM1ESuzqwpYWvvMVZEdez2f3yyqE3fWbJbpePOV9ZfBthzOUDR6LYE zXflTOmzBke/sSkP/PDPEKmICPTQCuyXEWFKgDCTSyNRD9T8dsBk47T/TmZ+zQhMi5ED O2a2EdLv+auQ/u0v+cL9wbIanrCm6/X5xQUnNFCfTyLRYKFtWwgXrip+OuGfWgeIClQy vEkdnFQh/OZgYDIQp0iJMk7I3qoQapHN5PjmYt66wsKYESvJroOc/PsMNVrYk+daA6Q+ W5ed8E6uHwXDkG8FmJRJabSv0omd+P6gpC4oURFfJRgC+HaFIpbagadRsytxDCuR5zwH 24XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679044371; 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=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=WbCQSWpD/yTy8m1G6rHhAv8d1YU2BoitTlEDTQJZrYza3Ev7J6t37sfN8kr4Hl2+oY pfccazxbVOjVJzDC2CffHEw+VJOciMqw9LN43m3iy+Dpwm+7986knvRulalAnRs7qgUw MokJhVJ60gdejzKXcg0voJHGOhRLh1zJlMH/np2andM9b1m+TxtMKh1NYhXFk9dGIJMD ja6CPpYgilPTyew1KbX2+sXbjpV8ZlVPbpOGH2YK9c0eCVy+BlbIk/LatU0TsTEyJvuS EC9cwl9e/qCmNvoiOv0o6bNEhm+UruHmVkYoKbjWeh/mumr8ZYDaBZ//BJa3440k4fHz v1XA== X-Gm-Message-State: AO0yUKXiIJhXl1IJU0UZ2vufpG3/Kre4PSCGbQEKpQZloPYN/i8hQUM1 v9qLYvZoE329PROO/qEQCo0kYg== X-Received: by 2002:a05:6000:186:b0:2c7:dad:5630 with SMTP id p6-20020a056000018600b002c70dad5630mr6085388wrx.27.1679044371551; Fri, 17 Mar 2023 02:12:51 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id j10-20020a5d464a000000b002cea8f07813sm1467976wrs.81.2023.03.17.02.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 02:12:51 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 10:12:48 +0100 Subject: [PATCH v5 2/5] arm64: dts: qcom: sm8350: switch to combo usb3/dp phy MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v5-2-a27f1b26ebe8@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , 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.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760605829932680072?= X-GMAIL-MSGID: =?utf-8?q?1760605829932680072?= The first QMP PHY is an USB3/DP combo phy, switch to the newly documented bindings and register the clocks to the GCC and DISPCC controllers. Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov #SM8350-HDK Reviewed-by: Konrad Dybcio Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8350.dtsi | 42 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 1afc4311796e..975ab4cbe57e 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -661,7 +662,7 @@ gcc: clock-controller@100000 { <&ufs_mem_phy_lanes 0>, <&ufs_mem_phy_lanes 1>, <&ufs_mem_phy_lanes 2>, - <0>, + <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>, <0>; }; @@ -2135,37 +2136,24 @@ usb_2_hsphy: phy@88e4000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy-wrapper@88e9000 { - compatible = "qcom,sm8350-qmp-usb3-phy"; - reg = <0 0x088e9000 0 0x200>, - <0 0x088e8000 0 0x20>; - status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + usb_1_qmpphy: phy@88e9000 { + compatible = "qcom,sm8350-qmp-usb3-dp-phy"; + reg = <0 0x088e8000 0 0x3000>; clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, <&rpmhcc RPMH_CXO_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "ref_clk_src", "com_aux"; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; + clock-names = "aux", "ref", "com_aux", "usb3_pipe"; resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>, <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: phy@88e9200 { - reg = <0 0x088e9200 0 0x200>, - <0 0x088e9400 0 0x200>, - <0 0x088e9c00 0 0x400>, - <0 0x088e9600 0 0x200>, - <0 0x088e9800 0 0x200>, - <0 0x088e9a00 0 0x100>; - #phy-cells = <0>; - #clock-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; + #clock-cells = <1>; + #phy-cells = <1>; + + status = "disabled"; }; usb_2_qmpphy: phy-wrapper@88eb000 { @@ -2268,7 +2256,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x0 0x0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; }; }; @@ -2633,8 +2621,8 @@ dispcc: clock-controller@af00000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>, <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>, - <0>, - <0>; + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; clock-names = "bi_tcxo", "dsi0_phy_pll_out_byteclk", "dsi0_phy_pll_out_dsiclk", From patchwork Fri Mar 17 09:12:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp236753wrt; Fri, 17 Mar 2023 02:32:38 -0700 (PDT) X-Google-Smtp-Source: AK7set/iohqJumTAS2nD2YnnpQknfxFgyvColBHmNXy7+KiDPfCJGy2DtV7ztrjkzrYH1BJSN5pe X-Received: by 2002:a17:903:2308:b0:19a:7060:948 with SMTP id d8-20020a170903230800b0019a70600948mr6765226plh.1.1679045558349; Fri, 17 Mar 2023 02:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679045558; cv=none; d=google.com; s=arc-20160816; b=D+Ow3ZcgJJPBOfR8mPNV9Lr+kT2rdQFdPtPbZcbD3QwwM4e9yd3iICdL4ZT2aD0kN6 s/UoYPTj0XCCp1BUldRewOFfqDSv/gkk/X8dASO83lP7PyWeCEGh6fTHYzA/Yifwyb+2 Gb3cU8InHslk+VcAFVAoyi2TeuoEc3SKFsYyGzs86IsSfQQjgBoglqElcHfQah02wK++ Dpr59toGXnOCYOpops5EOsYXxp9DY1QsTyo7zwyi7BmBeNxsHo3406V6tHczRS47inVt tR6bGYZG0MbID6XyjrxG2XCVwFvX9HgY7qNx08eCBAoM+xZ0RcnUSwEgA58ObJA50U1B 5D7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=IsclgAbS3rbIW7FZHguIeDH6KZDloDI95tL7UtBDjJ0=; b=P2wPM2ZZ2sjlpQVLL3Nwb+f53gfJqEShTjDyBTC29Z/p38sFhktcWmqRtgdt9HK7sU 0OsTdPsRO4EoK+CEawUqWiRwlz6dcl8R60CRHFFA9eRphNi0ks2NtNFh5oYXmhaKaUum FN2MbEkpp74wPBeV8BE3WgpyLEpfpvpCMI/HrwXFPwtJNLn22N2cvvjdh/JfKGv259yj q0LJoWkB2Wrk5eTseGgDE9lCqTHvsMZEG6nCBuOeOsoDC7X0lNs4l9oIo1UL81bZG/yH xk74l5QBviqCpgLqmm2oGbaPlFjUqHxm8vWjvDXgAaE7h9YbfKnNykd8srxcoWEg8c5Q MiyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CQOtJq4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id li12-20020a170903294c00b0019ac69e7385si1902403plb.123.2023.03.17.02.32.25; Fri, 17 Mar 2023 02:32:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CQOtJq4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230088AbjCQJNI (ORCPT + 99 others); Fri, 17 Mar 2023 05:13:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230357AbjCQJM5 (ORCPT ); Fri, 17 Mar 2023 05:12:57 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DA7712851 for ; Fri, 17 Mar 2023 02:12:54 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id v16so3794967wrn.0 for ; Fri, 17 Mar 2023 02:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679044372; 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=IsclgAbS3rbIW7FZHguIeDH6KZDloDI95tL7UtBDjJ0=; b=CQOtJq4h9MXDuBlkxkN/enldCB3Z/orNkBGeGxokzv8TQA76okAYfdFwt7rJsm9pWg sOizx7bgczOn7U4lX89/bzNmT1b7TLDRg1au+f337Pvn6ygsB3JsUIlwbW5TydwqgwYr 8GRSh8Zmd/RMSuu+qbUxC8+DcGP1lBqeI9aZNbkRNOjt3m7gkdnfe156PgfcQAi4hbms ZpThOT8Virlrgd/5mafsE/+/BCC+HQnqoXVG0BDxWnI+TUaDk7u78q91i6ACtCcVX1GY +94VLF1G6IOxywCjHga5CKn5U/2e7kBWqOGIo6uBJ71nkJBhuK3wXVJ8cqbr7nYDoRfa 1EvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679044372; 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=IsclgAbS3rbIW7FZHguIeDH6KZDloDI95tL7UtBDjJ0=; b=1ilOXi1k+UNMUoiM8brv3j8xAWlTjoq1M7bMhHwZ8UQdt241pkJn8/7aHzELrzzk/Z dpr2nsWqFwC4ppPxDUy8loDV/VFM20rMWS/nC9DQFt764mqKUz7u+cdrZ6MwblAl4MbE AOGHUXOq3Bhr0hpOw9mesihmdeFR3S0U/HPxO1YzXV/Va1gWO6OBOxQQqeHHE/38QZ43 AOA1jDXcjKNrwoSxU039ZdExHVkxxI/hvjsoMsTNbgLAyTjx/WpyfEGipbwJ1IxT66lE FvjqsCT/oxWH2RSBiqLlqz4F6kFcQVcW7hcUZa9YqSNjCVRaSo7g8td2Xw7dX0uvFiXF bFTQ== X-Gm-Message-State: AO0yUKVWwtdJtTQmoxLfmwSUED71RySsJxToQxec2OSC82fzMnMjOXEX vyGXJSqInqm+9pnqEKhpQ7JISQ== X-Received: by 2002:adf:e707:0:b0:2ce:a162:784c with SMTP id c7-20020adfe707000000b002cea162784cmr6537417wrm.65.1679044372589; Fri, 17 Mar 2023 02:12:52 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id j10-20020a5d464a000000b002cea8f07813sm1467976wrs.81.2023.03.17.02.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 02:12:52 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 10:12:49 +0100 Subject: [PATCH v5 3/5] arm64: dts: qcom: sm8350: add dp controller MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v5-3-a27f1b26ebe8@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , 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.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760606875380055662?= X-GMAIL-MSGID: =?utf-8?q?1760606875380055662?= Add the Display Port controller subnode to the MDSS node. Tested-by: Dmitry Baryshkov #SM8350-HDK Reviewed-by: Dmitry Baryshkov Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8350.dtsi | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 975ab4cbe57e..37ae4a948be1 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -2415,6 +2415,80 @@ dpu_intf2_out: endpoint { remote-endpoint = <&mdss_dsi1_in>; }; }; + + port@2 { + reg = <2>; + dpu_intf0_out: endpoint { + remote-endpoint = <&mdss_dp_in>; + }; + }; + }; + }; + + mdss_dp: displayport-controller@ae90000 { + compatible = "qcom,sm8350-dp"; + reg = <0 0xae90000 0 0x200>, + <0 0xae90200 0 0x200>, + <0 0xae90400 0 0x600>, + <0 0xae91000 0 0x400>, + <0 0xae91400 0 0x400>; + interrupt-parent = <&mdss>; + interrupts = <12>; + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_DP_AUX_CLK>, + <&dispcc DISP_CC_MDSS_DP_LINK_CLK>, + <&dispcc DISP_CC_MDSS_DP_LINK_INTF_CLK>, + <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK>; + clock-names = "core_iface", + "core_aux", + "ctrl_link", + "ctrl_link_iface", + "stream_pixel"; + + assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>, + <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK_SRC>; + assigned-clock-parents = <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + + phys = <&usb_1_qmpphy QMP_USB43DP_DP_PHY>; + phy-names = "dp"; + + #sound-dai-cells = <0>; + + operating-points-v2 = <&dp_opp_table>; + power-domains = <&rpmhpd SM8350_MMCX>; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + mdss_dp_in: endpoint { + remote-endpoint = <&dpu_intf0_out>; + }; + }; + }; + + dp_opp_table: opp-table { + compatible = "operating-points-v2"; + + 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>; + }; }; }; From patchwork Fri Mar 17 09:12:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp237764wrt; Fri, 17 Mar 2023 02:35:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9R5yC9c+jjH8L805Kdn0bsn+ps4R4eerSVNJhLR20zsIC8It+KVw5btIDCmBLKXuFjwxIy X-Received: by 2002:a05:6a21:32a2:b0:cd:9bcf:d251 with SMTP id yt34-20020a056a2132a200b000cd9bcfd251mr8189764pzb.0.1679045740629; Fri, 17 Mar 2023 02:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679045740; cv=none; d=google.com; s=arc-20160816; b=id9tlY4FoiAWBVTcpBOZzgf3EIeVWhUrjktpNZalqHJ7FL9lWyU8DWxs9wnhbiAo1p hm44WfmfTC6i8MXntgg+CpoaWpAFOEVJyE1beBPPHkosS2AUD2uHHI/QkCfkCzT1E19X GtPzs/UUzCHndR4YiJlKO3MrnhvBHIX84o/3Skxx25+75NgfO7WHkUj8wO989eWGH1Zj oGAH+yLnwPo6ilDN7mKhsINgUuKmMMfiNsDp5UzaWlmFIs+0Ro/J2+hbKXiEcjeXMi6x CU7xr3phJotyBykHOMm9sgyOf0fhth7S6YR+s6A8SmOCHP+2rNONrdDupWx9BNyD0DGd gxNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=GZIs3r73pgtpcK0YdCZ3Ri1mi1f0OffOfBOdtovynl8=; b=AlEK/eI4BpE4KQvb68Zuh4hFQ9/vu41hggpg9XBuV6WBKjzUsT/+HRLOfg+C0k72Me OgNR7d92rYLJTA6TL2M4cEwFhJYQUs8VgIqhe3RQR7W7d4zuwuYKSlXKTmMz7ag094Z5 pXHFoL13g5D+/jwW5hA6Bk2oT8JTEWT1TbRWPpVDBdE5thX2/lfZVNfJvYCbGEjRd4x4 yxyCx02lySUVKV30fkDn+1ULhOL2jHTQlL0Ay5qsnMRrgpHfcZezQ/SNkEOepaEtcCTW BoZRQrJs3n+FEsM0Eyr+itue4oZVxreuS9Bok6gkg1yxXAWsYrgkYAmX6UEO6igJ6kkS o/mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nSghV9Cc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 7-20020a631447000000b00503a2ab160esi1785823pgu.553.2023.03.17.02.35.25; Fri, 17 Mar 2023 02:35:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nSghV9Cc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231251AbjCQJNE (ORCPT + 99 others); Fri, 17 Mar 2023 05:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230410AbjCQJM5 (ORCPT ); Fri, 17 Mar 2023 05:12:57 -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 4C3681E1DA for ; Fri, 17 Mar 2023 02:12:55 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id q16so3779816wrw.2 for ; Fri, 17 Mar 2023 02:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679044374; 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=GZIs3r73pgtpcK0YdCZ3Ri1mi1f0OffOfBOdtovynl8=; b=nSghV9Cc8Q/DC16MdI2Wtprf7UPERnn9OF68wgS912+UZt2ghc/VtITiU4NfRjGZDZ jqCvkffJ4TkOkg1daBx3XYgdAWUJc6xYa/ILiDMf6UmGmoX0707Qg+QCi8vpOPAis2Mj W/uYgQcwoPMIdx8dlbjTghgSjcHXg1CDvRMKoCZIAuSWxWGzflRlq7dbAcoeloIz8APd y/tBAzBFBHwmb8tLtLmAGeeBgeWKNtIQsVCUrf4geL7igQoM6or51199pXZGurzV7FD5 QIeumQc3HGx7l5NzUoANEMaBgB+ZERW2uWIwLFCYj467JQYp+PrAWH+SOwQICm5CVBAY 4JpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679044374; 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=GZIs3r73pgtpcK0YdCZ3Ri1mi1f0OffOfBOdtovynl8=; b=FhHNOSGccEEaJJ/90M6+1JIyR/Khq9gof5e/+OeqoDJNhLGE0ZmGx795N+qq6RIxlN 897WlcJTx9cJvqDg/1NmaNDDaJlSOxixhcZ3Z/Y522+sZfpkkx4P0vSUqSjZfpeJsCE4 ZddJ4DNgfM2eAFXWfi4AvKq4ewx+bunPwJt99pk1nenjb/4DdEJTSQFS8wvX0egBrBGP GDpMNybT6QqAYYtOUdz+tR7WlnoP6eFMuVF+VE2FC/VWW6M727rigQ7pmF7DDB213aKT PjhNCK8hqjhbKkilltaGqAseFZ1Dadec0Dlw5ZS5QLfBin//pdidcKnnn5Mr+ubLEpPB C2ZQ== X-Gm-Message-State: AO0yUKW/tUecXdDCTbVu/d901Lo/1HLsrUTL6AKVK82hFIrTyMaTVsg3 SaERvyFj/E4Gl4PNThS+lV2blw== X-Received: by 2002:a5d:62cb:0:b0:2cf:e3c9:bdc with SMTP id o11-20020a5d62cb000000b002cfe3c90bdcmr6244506wrv.60.1679044373687; Fri, 17 Mar 2023 02:12:53 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id j10-20020a5d464a000000b002cea8f07813sm1467976wrs.81.2023.03.17.02.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 02:12:53 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 10:12:50 +0100 Subject: [PATCH v5 4/5] arm64: dts: qcom: sm8450: switch to usb3/dp combo phy MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v5-4-a27f1b26ebe8@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , 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.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760607066881108493?= X-GMAIL-MSGID: =?utf-8?q?1760607066881108493?= The QMP PHY is a USB3/DP combo phy, switch to the newly documented bindings and register the clocks to the GCC and DISPCC controllers. Reviewed-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 42 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 69695eb83897..0b5a151ce138 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -748,7 +749,7 @@ gcc: clock-controller@100000 { <&ufs_mem_phy_lanes 0>, <&ufs_mem_phy_lanes 1>, <&ufs_mem_phy_lanes 2>, - <0>; + <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>; clock-names = "bi_tcxo", "sleep_clk", "pcie_0_pipe_clk", @@ -2034,37 +2035,24 @@ usb_1_hsphy: phy@88e3000 { resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>; }; - usb_1_qmpphy: phy-wrapper@88e9000 { - compatible = "qcom,sm8450-qmp-usb3-phy"; - reg = <0 0x088e9000 0 0x200>, - <0 0x088e8000 0 0x20>; - status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + usb_1_qmpphy: phy@88e8000 { + compatible = "qcom,sm8450-qmp-usb3-dp-phy"; + reg = <0 0x088e8000 0 0x4000>; clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, <&rpmhcc RPMH_CXO_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "ref_clk_src", "com_aux"; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; + clock-names = "aux", "ref", "com_aux", "usb3_pipe"; resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>, <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: phy@88e9200 { - reg = <0 0x088e9200 0 0x200>, - <0 0x088e9400 0 0x200>, - <0 0x088e9c00 0 0x400>, - <0 0x088e9600 0 0x200>, - <0 0x088e9800 0 0x200>, - <0 0x088e9a00 0 0x100>; - #phy-cells = <0>; - #clock-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; + #clock-cells = <1>; + #phy-cells = <1>; + + status = "disabled"; }; remoteproc_slpi: remoteproc@2400000 { @@ -2972,8 +2960,8 @@ dispcc: clock-controller@af00000 { <&mdss_dsi0_phy 1>, <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>, - <0>, /* dp0 */ - <0>, + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>, <0>, /* dp1 */ <0>, <0>, /* dp2 */ @@ -4168,7 +4156,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x0 0x0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; }; }; From patchwork Fri Mar 17 09:12:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp235827wrt; Fri, 17 Mar 2023 02:30:03 -0700 (PDT) X-Google-Smtp-Source: AK7set9kHCeOi0n+Fftuk2MaNVVGEmv0OCvCMiFKs3jANugqwRknWUtYgIFrGEiuZPxIWsvjFY6W X-Received: by 2002:a17:902:e852:b0:1a1:80fb:d040 with SMTP id t18-20020a170902e85200b001a180fbd040mr6239898plg.2.1679045403270; Fri, 17 Mar 2023 02:30:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679045403; cv=none; d=google.com; s=arc-20160816; b=xARU4tnoXTD4Ix1qZwCojg2yF1w/WLEV33bQpfegsgeAY9DhM4TDa5/x2i1mg0Zo0N xrYF94x33F/Ws3RBnCX5RsEGvMfBfRz2QFLTTYgvFpyFdNTfJqEMxxnj4+3OqMJ+PwAJ 6uYg0XwgyR+5KKLd6iEDuK4+yss0+BAKQGWpm79r6tLg8w/I2QWhBSlVNPPUCUkOtVi5 3o9nZAsXWp7+RdwJUtZJ4upS/VRgGFTkuvkvZVSvUuuf0yaulynsgnUvuQ5y3/b6HXha 5h4/swyBwL4tTvZHffQTFAhilGgmG0FL/NjH5Dw35rgh57Zb45iX8jJSO/2Vjm3AfZSt f7kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=jy9Gq9StQdq060iKXKxV7Ee3X06YY4EYtIafip1P6OE=; b=roin81NR9kISwio5UQjsWBgFCRrWRLp6nYg0HyKxcRlmbo2khOibXMua8Xqww15jB8 zaluVIoW8VPhwDp3vGa3Z3K4OBB8FTbL5hh3ohIf1W+1ycAJnOPnmOgnDj1lFSmor/4Y pvFEPLuu5kCLGmCpmeRV8wg+sGfhaXfiP/xKwlQqm1puY3+oXtbM9MjHFVHZsCB9QuqW OzCmYrzyGusS1Kvz+vcl2a4RoDer2KNHJnELLm5/Zbpw5jef8RrfQJPjUNiHV6dbSpbE tqgOirQO7LqsTcd4CS2iN9yV3oC4Sj+ED9doODwEy5hXYrP4skPO8G7Kp5eTSpjFb2Xk YdUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yybmrdoI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c22-20020a63ef56000000b004fb35911c7dsi1810360pgk.541.2023.03.17.02.29.50; Fri, 17 Mar 2023 02:30:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yybmrdoI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231324AbjCQJNN (ORCPT + 99 others); Fri, 17 Mar 2023 05:13:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbjCQJNA (ORCPT ); Fri, 17 Mar 2023 05:13:00 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40C812BF34 for ; Fri, 17 Mar 2023 02:12:56 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id r29so3752638wra.13 for ; Fri, 17 Mar 2023 02:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679044374; 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=jy9Gq9StQdq060iKXKxV7Ee3X06YY4EYtIafip1P6OE=; b=yybmrdoIoTHCR6O3L9hSPD5WZJ3vnaCZV+MIEHRbZ1W6O/KByW9SxGP21FKXu6OI/g vedoFay4HWhnOhIJjMcw+yF3gwv3qyrGCkJBnr9B+P6+frWirokswGctgkH1POTACWoO f1GRpbIPjRuXCXlRsEgHQ4lJBppNyGW2e+BS7X8iXT0N71BlUFTKgeglDTMp0M4dbzwd UtnonkzrFYxsnCquWa5LP1MWjXDbjt4tU4Ik5iXtXJ7vsPHeLIwsVGh0Bs9vHxbqYmyH fRU1knuv6QlfQsm1QNvvlXRTTZkS/BX1MpNu84KyPBel6se+VgJkH6rG7Zd5UPsclF6f XQpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679044374; 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=jy9Gq9StQdq060iKXKxV7Ee3X06YY4EYtIafip1P6OE=; b=kNSrksoVCgLKlhdvONhWivEwfxN9gAhFoDyxGI+2UMWBkFNclW4xG3H/jENdYSnIEu 3S1eaRzjUUA8p7t4UxkzJY2xXOpldOIAN3uVqns2Nl+Tq+gfLxP6tmafkv1oa3E6ljTq yY1TRYLE0bAMG3vsKb1NYuWeWwZrzxJoiXo5uQCb/fX8M78K4g9Dygx5IokTBt6/Olh1 ssVIAzVc5++WJ/Xaw1Pf/yTV49j80V/9WgoPLePQnblSWGzSAXP/WuDW8no/mecl1siJ tcR/XehnW0dcHNE+bgisepWo3j9w5s4iugi86A8m7LiwLtACHZVQnqUosNnYAxqUXZqD QDGw== X-Gm-Message-State: AO0yUKVXQaMdT4uEpKRsgB9LCwHfEtogFadrfIOIvsfuktuqnoUOy9Th PC7y8ulwo17NvMIFlEzTlNzFIA== X-Received: by 2002:adf:f605:0:b0:2cf:e449:1a9e with SMTP id t5-20020adff605000000b002cfe4491a9emr1747052wrp.30.1679044374779; Fri, 17 Mar 2023 02:12:54 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id j10-20020a5d464a000000b002cea8f07813sm1467976wrs.81.2023.03.17.02.12.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 02:12:54 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 10:12:51 +0100 Subject: [PATCH v5 5/5] arm64: dts: qcom: sm8450: add dp controller MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v5-5-a27f1b26ebe8@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v5-0-a27f1b26ebe8@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , 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.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760606713031858310?= X-GMAIL-MSGID: =?utf-8?q?1760606713031858310?= Add the Display Port controller subnode to the MDSS node. Reviewed-by: Konrad Dybcio Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 0b5a151ce138..41f5015e615b 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2751,6 +2751,13 @@ dpu_intf2_out: endpoint { }; }; + port@2 { + reg = <2>; + dpu_intf0_out: endpoint { + remote-endpoint = <&mdss_dp0_in>; + }; + }; + }; mdp_opp_table: opp-table { @@ -2783,6 +2790,78 @@ opp-500000000 { }; }; + mdss_dp0: displayport-controller@ae90000 { + compatible = "qcom,sm8450-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_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + + phys = <&usb_1_qmpphy QMP_USB43DP_DP_PHY>; + phy-names = "dp"; + + #sound-dai-cells = <0>; + + operating-points-v2 = <&dp_opp_table>; + power-domains = <&rpmhpd SM8450_MMCX>; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + mdss_dp0_in: endpoint { + remote-endpoint = <&dpu_intf0_out>; + }; + }; + }; + + dp_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + 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,sm8450-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae94000 0 0x400>;