From patchwork Tue Jul 11 12:09:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 701603 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 56233EB64DD for ; Tue, 11 Jul 2023 12:09:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231531AbjGKMJx (ORCPT ); Tue, 11 Jul 2023 08:09:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231543AbjGKMJn (ORCPT ); Tue, 11 Jul 2023 08:09:43 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0620F1994 for ; Tue, 11 Jul 2023 05:09:25 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fb77f21c63so8920466e87.2 for ; Tue, 11 Jul 2023 05:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689077364; x=1691669364; 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=y3iHTRXTkkh620hWnpEMBxRgsWFmrcbj8C9JwVRsltM=; b=kWQuzg6fl1JkZRpu6sPKFkXE/n1WSY/erM/AZL2kFm6U/FxXGWg8r3DjG61oAHVDIx OiyEe5AP55bs2b2ozPNIxcANgv4GedAzoHDqwX7yv0+ZHa+E7FVLtNrN8awO+lVaX+SS jjdMqgmP1Er8DtE+AIc8zQPQjx8uiXnL8b5EOB3HF6ybc5mUdm32kwa/b3C359X75m8L /vgPiGGuA8PPph5miHNQAvTE5SiUn7E1lgph/6TdRTxT20CUCq85AuHjIM07usNBvfSl idDsPrBctTvOmFa1lA1KvrKCFERYY64OMGv6vUi4HyDozldIu2XvmqmOy0ni+OLlNory OjIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689077364; x=1691669364; 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=y3iHTRXTkkh620hWnpEMBxRgsWFmrcbj8C9JwVRsltM=; b=J29gjf1cep8OmeqtMVAbyY8St5IIlKhDuistnUYpUtEP/rPlpPV1mStj3jLohBjS5I i/eix4SAY/nwsApb753zavpzcNOp8lEqEG+nJnm7gNArqJYFmuTAzrxFw5dLSM2Z7Kor ZQrRSrFUkC51HhWYcg8U6rKsxvnBb7S1hoS5r4ZNClD6U73Q9qgbpRkfNIrRHakRSnH8 XT9dlZOYZJ7BDPxX9wc1EjsZjm6aKlzQrdtflm3cfWVVaqeQjdLQF2w31zOj9fExOLdt 1XonofBRyeo8OlF3QJpzEbCs/w+70F3hLzdK/pRBn+VcGhGsfp3NMRduGjVfoIt1kt9d HX8Q== X-Gm-Message-State: ABy/qLZNvJlqbOjfT2Wv9r3V6UY/KphXRKe+F5/InJMrDfe2CxCcrEZd dUMWmMfTRs533P0kC6WB2bmXCw== X-Google-Smtp-Source: APBJJlE6wqesBwamFigty4tFa1SvHzCNi78fFqcs/uua5p7eDPo4KHw+NDyBcBSbLXsaRhB2zOLxLg== X-Received: by 2002:a19:7b0a:0:b0:4fb:9712:a717 with SMTP id w10-20020a197b0a000000b004fb9712a717mr10501165lfc.13.1689077364053; 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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 05:09:23 -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 09/10] arm64: dts: qcom: sm8150: switch USB+DP QMP PHY to new style of bindings Date: Tue, 11 Jul 2023 15:09:15 +0300 Message-Id: <20230711120916.4165894-10-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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/sm8150.dtsi | 44 +++++++++++----------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 0cd580920a92..6ff7cdacd44d 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -3434,38 +3435,27 @@ usb_2_hsphy: phy@88e3000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy@88e9000 { - compatible = "qcom,sm8150-qmp-usb3-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x10>; - status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + usb_1_qmpphy: phy@88e8000 { + compatible = "qcom,sm8150-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_CLKREF_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "ref_clk_src", "ref", "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 0x218>, - <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"; - }; + #clock-cells = <1>; + #phy-cells = <1>; + + status = "disabled"; }; usb_2_qmpphy: phy@88eb000 { @@ -3606,7 +3596,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x140 0>; 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"; }; }; @@ -3941,8 +3931,8 @@ dispcc: clock-controller@af00000 { <&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",