From patchwork Tue Jul 11 12:09:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13308490 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 49127C001DD for ; Tue, 11 Jul 2023 12:09:32 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wUCmZbMfQuuTi9Xqpif3dcQ5sdqQgGku38+wxEZKV3E=; b=LlQUeqk4q9mt45 QHcCYszBxXza2ikbTvWUNOJZghY+MhST4SzwyhVo5t5bb+1JrD+ZzvcXOcNSm8HQawdy+BnvVOucS 1uQz8/MSH9eq57yWLbilnT0Rvh/mJOlS7Y82Q2zRcq4OHQN0/IIZX+qaVCVdWChAHeDzIvnH0+aDU 55FB5t1Vjx2i1HFGn6Q4TBBtGkPc06hcm3biLmJ8NW+4vd0W3RAv12HwjM2RZnyWQIkEzv6FW/HeD T/V8BvtTNUYp2rBQi6uCTNQ8AhP1WMX5RuVJ7j7FTpmsHRzz2YkLYveFR5JUydZ65qMPbuwy0FMbR puPTP0R3RFBky09e7LRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qJCBP-00Epte-36; Tue, 11 Jul 2023 12:09:31 +0000 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qJCBM-00Epp2-2V for linux-phy@lists.infradead.org; Tue, 11 Jul 2023 12:09:30 +0000 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fb41682472so8201162e87.2 for ; Tue, 11 Jul 2023 05:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689077365; x=1691669365; 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=w2uwj1bDNNvjwVF1sPPFd+G4qQu0YqRBY17DnaA0U10=; b=WZhGgoX9jtQwPJ9AKb1ozh9pXthX5HzfE7kPZXHkmnKd6rWS6Y2JrO0ZvBIDQM4zhr GZKHMunhuRK7oe3fjE7jB6zUvwvdXGN1pfeTgl2ybOOyFtojSBg1AaauKGg3rOvTON+O kfqco5eKI1dO3BgmrTqEDWxWROBUTH5LLkYxspsUCcxIw994ckcHpN3MDEUKOSacps0b krN4PfLOVQnRPJyqD/s8NbtL/PDeuj8jv9dQnH0GJUDTLQXKjwgaNTnnapff9ONKjUbv /pIYrXrO3wA5BvehQlwVe1fQ5QcB326SZKlTLBMerbcUm2N47z8OsGEehdMlZtc2955+ vUlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689077365; x=1691669365; 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=w2uwj1bDNNvjwVF1sPPFd+G4qQu0YqRBY17DnaA0U10=; b=e4lVLNq4EYeUiKU42hf6E1uqTKSYMpZVyaVgHhzp6Z3Ci8kAOKLNtasIvrXjOIgwwG lTNPuHe7nu35uMRLEO5yr4CTBeANxXK1CaXQothFkx6LakxCBA2AmnCor9GxFon/a7T5 lYYAWG0Qz/c7CPZG/XAQJjBKCeMQkRlzgign+omMZTmeY4gzfHWmPB/aRkyGfCjIRdaG s3GsmR18rD1G5Q+pZFx2GmxOTS4puYGO/NwzB4lrvGgntLBRSCzmvsy8tWoid5XeEoqz vtLnCyB2AJrgER6XfGAc0Df2pfn1P5rPzUvjDkG3ii5PxtwFs5/4phOUdpvNxxNBJBvc BHGw== X-Gm-Message-State: ABy/qLZCK7/jpNYNw9qdK7cbtjH6CQ4QsKp9sKd3F/Dm2ZWmNemvIsZy eLTddk6A0Kwylqx2MDSv8qKqlg== X-Google-Smtp-Source: APBJJlE5IJlyE8QhwkDDqboYFcDJDnrTlgreC1HrQFzhZiylrgABsPgEDgaV/M6shmfvw4g42gs2QA== X-Received: by 2002:ac2:5b1e:0:b0:4fb:8bab:48b6 with SMTP id v30-20020ac25b1e000000b004fb8bab48b6mr12540488lfn.52.1689077364959; Tue, 11 Jul 2023 05:09:24 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id h22-20020ac25976000000b004fbbd818568sm291447lfp.137.2023.07.11.05.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 05:09:24 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Neil Armstrong Subject: [PATCH v4 10/10] arm64: dts: qcom: sm8250: switch USB+DP QMP PHY to new style of bindings Date: Tue, 11 Jul 2023 15:09:16 +0300 Message-Id: <20230711120916.4165894-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230711120916.4165894-1-dmitry.baryshkov@linaro.org> References: <20230711120916.4165894-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230711_050928_941309_9F2223DF X-CRM114-Status: GOOD ( 10.19 ) 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 Change the USB QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 49 ++++++++-------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index e03007e23e91..d522dea65ba7 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -3575,48 +3576,26 @@ usb_2_hsphy: phy@88e4000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sm8250-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x200>, - <0 0x088e8000 0 0x40>, - <0 0x088ea000 0 0x200>; + reg = <0 0x088e8000 0 0x3000>; status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; 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: usb3-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>; - #clock-cells = <0>; - #phy-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; - - dp_phy: dp-phy@88ea200 { - reg = <0 0x088ea200 0 0x200>, - <0 0x088ea400 0 0x200>, - <0 0x088eaa00 0 0x200>, - <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>; - #phy-cells = <0>; - #clock-cells = <1>; - }; + #clock-cells = <1>; + #phy-cells = <1>; }; usb_2_qmpphy: phy@88eb000 { @@ -3765,7 +3744,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"; }; }; @@ -4459,8 +4438,8 @@ dispcc: clock-controller@af00000 { <&mdss_dsi0_phy 1>, <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>, - <&dp_phy 0>, - <&dp_phy 1>; + <&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",