From patchwork Sun Mar 31 03:48:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13611797 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8ABB72FB6 for ; Sun, 31 Mar 2024 03:48:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711856940; cv=none; b=p/fqXgxIe6PAM0gJEAZFVqtsan2v2T7IJ+t5Gb8qJrJHfAv/oIw775BIaziztSqGYC0pAs2lu+AVqzp14pbEjHPmLedFAFrFJ3noy5tR2wk47w3j9fiUJ+0xK5ErHbkXH4Lj959s5t+fVL6VQoPGHuqTtTnikELkZelMy445DW4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711856940; c=relaxed/simple; bh=7EfGB7yMpXjvioQX1Rm4KbJ/AxGqyNRro4p3nMwNvYk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JFOLG8LnPykpGKeYYDAffw/JWd/jTrMf47suX86bzCjLMRG0rLhlMgqtw1xFzXsrhRHu1MdIIO+GHbdbtDp2KUfhYpm38OG0PPHY6udv6hNiSTqLU4OapHao6qN1lTGH1YJ//ImEHbxZWR+RzbFIiKK+GL/++a97wxGG/rT0r9E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=XfXgtR57; arc=none smtp.client-ip=209.85.167.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XfXgtR57" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-513d212f818so3427125e87.2 for ; Sat, 30 Mar 2024 20:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711856937; x=1712461737; darn=vger.kernel.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=0Y3Kfoqzh4vQdnhmhi8JCYRXAxYg/BtE6kzbs+VhT7c=; b=XfXgtR57HfAHDsOvz2HpmgNPP1ssyUFpRgF3IXOy4RNBFEcsWPc9t/X8tdrPbxi/Ch L+iUCt7in6mcX6ZWUq6Ri4mmWZ1DKB8lZitsX6nIOQQjneAOx96owHKH6VlByjkSSKjQ 1Xr9eU5FB3fp6k3rksARiOUhZpnKk9U37K/90UbDYliK9XrzW2FFEJiK6TmGgCFqACvl EuUmzzT5iGUHjRe/a2uLiIgQ01r8qbHr7rDHgHARFvN+iMR38fsvJiy2Htmwfz6/HpC0 oZ0JdOcBHqvino/nQ5TXcQ1j60TU3Uwx15alGM+15YGIsl+76+y/m2fVn9JdU6UkvIbz YP1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711856937; x=1712461737; 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=0Y3Kfoqzh4vQdnhmhi8JCYRXAxYg/BtE6kzbs+VhT7c=; b=GwpkoH1NPjEefspz43jab1TMtc0Lys0qcHO5v1D8dcCuO7do23eTgLad/kCU4CFw8w KmX6CIZKPCJkFZNmBt8UHyYl84h7aYnQ49U2/5VRp22GGdPdFGmk4mbmZ1ZwPE7QkDOo 88MdKvtuZ7OSyuD4fbllQSkIPOKXmxykAdm6+z8oJWpHqaNVrjcrwSeuVsvT5GVWTQ9x diO3BzIlkww/vI4Xw5YsmS8n9DDtGzd8y2waTAnZcIpeRIAJK/iaUb+Kifjk0lojdnjb rzHbq9dN4/CA/fFWrlTH/a6hUKxPkwR3/reDd5yhJelG1ginRjQldCOm5ZckvvXPphtr tGEw== X-Gm-Message-State: AOJu0Ywr4Ckt6//k14FuOHXzOmrHvttZmH4g4liAztv47cUoPxrmqbOT gEzBqFsETfHhNIkzJvcIdiqubJ55bKcBgNztmdROHf2M5/BmeYkpgFLfSHMVaYI= X-Google-Smtp-Source: AGHT+IGjGZyuSXqa1dUNjuuUsixOj8hsFbiTi7Xa0rfvK8aIVB2Iz49ByhpTc7vHL+OEENUBVikqWQ== X-Received: by 2002:ac2:5967:0:b0:515:8564:28c8 with SMTP id h7-20020ac25967000000b00515856428c8mr3869538lfp.67.1711856936838; Sat, 30 Mar 2024 20:48:56 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id k9-20020ac257c9000000b00515ce9f4a2bsm762980lfo.35.2024.03.30.20.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 20:48:56 -0700 (PDT) From: Dmitry Baryshkov Date: Sun, 31 Mar 2024 06:48:53 +0300 Subject: [PATCH v2 3/7] arm64: dts: qcom: sc8180x: switch USB+DP QMP PHYs to new bindings Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240331-typec-fix-sm8250-v2-3-857acb6bd88e@linaro.org> References: <20240331-typec-fix-sm8250-v2-0-857acb6bd88e@linaro.org> In-Reply-To: <20240331-typec-fix-sm8250-v2-0-857acb6bd88e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bryan O'Donoghue Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7314; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=7EfGB7yMpXjvioQX1Rm4KbJ/AxGqyNRro4p3nMwNvYk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmCN0kmRlru3z7W/EQJ1pjMDWDYzAqUFK28kj/B gnu4uEseqWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZgjdJAAKCRCLPIo+Aiko 1fvyB/0dRs9XxVkYHWdBpUSVhGvi6TQ45UtXZhwWGd5o+SK5HqekFeVhhaVxOhNqnWmWZfNbSpB dNTEZeE7ZFCMwJKpOa7LXcqx5olagaLjPboXKlI61+z4hfrzwq+erqQN9yrtxrimKF9jNV1O90j 9RoiIKTtwF+crgNPURfnBpzwgylQgNmr3eRqGbJjiADvaTbWlUXSkUFvbrg9wNkLX4eIIHfMDSl q1d/UhkLiaUCNsbM6DPUOTrGTObZZ9uJf5MYlyZAiRuXPJzpZH1om3RBlPX1kAGTF8uLgKSOmEa 6gG1O7E/NXdUiIg0C8Mbm4Caqclov50i10fqdHpwQhpRCpz2 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A To follow other Qualcomm platforms, update QMP USB+DP PHYs to use newer bindings rather than old bindings which had PHYs as subdevices. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 122 ++++++++++++---------------------- 1 file changed, 41 insertions(+), 81 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi index 32afc78d5b76..a4931b5ee86c 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -2472,28 +2473,25 @@ usb_sec_hsphy: phy@88e3000 { status = "disabled"; }; - usb_prim_qmpphy: phy@88e9000 { + usb_prim_qmpphy: phy@88e8000 { compatible = "qcom,sc8180x-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x38>, - <0 0x088ea000 0 0x40>; - reg-names = "reg-base", "dp_com"; + 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>; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; clock-names = "aux", - "ref_clk_src", "ref", - "com_aux"; + "com_aux", + "usb3_pipe"; + resets = <&gcc GCC_USB3_DP_PHY_PRIM_SP0_BCR>, <&gcc GCC_USB3_PHY_PRIM_SP0_BCR>; reset-names = "phy", "common"; #clock-cells = <1>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + #phy-cells = <1>; status = "disabled"; @@ -2507,59 +2505,38 @@ port@0 { usb_prim_qmpphy_out: endpoint {}; }; + port@1 { + reg = <1>; + + usb_prim_qmpphy_usb_ss_in: endpoint {}; + }; + port@2 { reg = <2>; usb_prim_qmpphy_dp_in: endpoint {}; }; }; - - usb_prim_ssphy: usb3-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>; - #phy-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_prim_phy_pipe_clk_src"; - }; - - usb_prim_dpphy: dp-phy@88ea200 { - reg = <0 0x088ea200 0 0x200>, - <0 0x088ea400 0 0x200>, - <0 0x088eaa00 0 0x200>, - <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>; - #clock-cells = <1>; - #phy-cells = <0>; - }; }; usb_sec_qmpphy: phy@88ee000 { compatible = "qcom,sc8180x-qmp-usb3-dp-phy"; - reg = <0 0x088ee000 0 0x18c>, - <0 0x088ed000 0 0x10>, - <0 0x088ef000 0 0x40>; - reg-names = "reg-base", "dp_com"; + reg = <0 0x088ed000 0 0x3000>; + clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>, - <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_USB3_SEC_CLKREF_CLK>, - <&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>; + <&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>; clock-names = "aux", - "ref_clk_src", "ref", - "com_aux"; + "com_aux", + "usb3_pipe"; resets = <&gcc GCC_USB3_DP_PHY_SEC_BCR>, <&gcc GCC_USB3_PHY_SEC_BCR>; reset-names = "phy", "common"; #clock-cells = <1>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + #phy-cells = <1>; status = "disabled"; @@ -2573,37 +2550,18 @@ port@0 { usb_sec_qmpphy_out: endpoint {}; }; + port@1 { + reg = <1>; + + usb_sec_qmpphy_usb_ss_in: endpoint {}; + }; + port@2 { reg = <2>; usb_sec_qmpphy_dp_in: endpoint {}; }; }; - - usb_sec_ssphy: usb3-phy@88e9200 { - reg = <0 0x088ee200 0 0x200>, - <0 0x088ee400 0 0x200>, - <0 0x088eec00 0 0x218>, - <0 0x088ee600 0 0x200>, - <0 0x088ee800 0 0x200>, - <0 0x088eea00 0 0x100>; - #phy-cells = <0>; - clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_sec_phy_pipe_clk_src"; - }; - - usb_sec_dpphy: dp-phy@88ef200 { - reg = <0 0x088ef200 0 0x200>, - <0 0x088ef400 0 0x200>, - <0 0x088efa00 0 0x200>, - <0 0x088ef600 0 0x200>, - <0 0x088ef800 0 0x200>; - #clock-cells = <1>; - #phy-cells = <0>; - clock-output-names = "qmp_dptx1_phy_pll_link_clk", - "qmp_dptx1_phy_pll_vco_div_clk"; - }; }; system-cache-controller@9200000 { @@ -2672,7 +2630,7 @@ usb_prim_dwc3: usb@a600000 { iommus = <&apps_smmu 0x140 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&usb_prim_hsphy>, <&usb_prim_ssphy>; + phys = <&usb_prim_hsphy>, <&usb_prim_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; port { @@ -2729,7 +2687,7 @@ usb_sec_dwc3: usb@a800000 { iommus = <&apps_smmu 0x160 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&usb_sec_hsphy>, <&usb_sec_ssphy>; + phys = <&usb_sec_hsphy>, <&usb_sec_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; port { @@ -3046,9 +3004,10 @@ mdss_dp0: displayport-controller@ae90000 { assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>, <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK_SRC>; - assigned-clock-parents = <&usb_prim_dpphy 0>, <&usb_prim_dpphy 1>; + assigned-clock-parents = <&usb_prim_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_prim_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; - phys = <&usb_prim_dpphy>; + phys = <&usb_prim_qmpphy QMP_USB43DP_DP_PHY>; phy-names = "dp"; #sound-dai-cells = <0>; @@ -3122,9 +3081,10 @@ mdss_dp1: displayport-controller@ae98000 { assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK1_CLK_SRC>, <&dispcc DISP_CC_MDSS_DP_PIXEL2_CLK_SRC>; - assigned-clock-parents = <&usb_sec_dpphy 0>, <&usb_sec_dpphy 1>; + assigned-clock-parents = <&usb_sec_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_sec_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; - phys = <&usb_sec_dpphy>; + phys = <&usb_sec_qmpphy QMP_USB43DP_DP_PHY>; phy-names = "dp"; #sound-dai-cells = <0>; @@ -3268,10 +3228,10 @@ dispcc: clock-controller@af00000 { reg = <0 0x0af00000 0 0x20000>; clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>, - <&usb_prim_dpphy 0>, - <&usb_prim_dpphy 1>, - <&usb_sec_dpphy 0>, - <&usb_sec_dpphy 1>, + <&usb_prim_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_prim_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>, + <&usb_sec_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_sec_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>, <&edp_phy 0>, <&edp_phy 1>; clock-names = "bi_tcxo",