Skip to content

L
linux
Commit 35e3a9c1 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: sc8180x: switch USB+DP QMP PHYs to new bindings 

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240512-typec-fix-sm8250-v4-5-ad153c747a97@linaro.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 88347987
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 81 deletions
arch/arm64/boot/dts/qcom/sc8180x.dtsi
View file @ 35e3a9c1
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <dt-bindings/interconnect/qcom,osm-l3.h> #include <dt-bindings/interconnect/qcom,osm-l3.h>
#include <dt-bindings/interconnect/qcom,sc8180x.h> #include <dt-bindings/interconnect/qcom,sc8180x.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/phy/phy-qcom-qmp.h>
#include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/power/qcom-rpmpd.h>
#include <dt-bindings/soc/qcom,rpmh-rsc.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
...@@ -2506,28 +2507,25 @@ usb_sec_hsphy: phy@88e3000 { ...@@ -2506,28 +2507,25 @@ usb_sec_hsphy: phy@88e3000 {
status = "disabled"; status = "disabled";
}; };
usb_prim_qmpphy: phy@88e9000 { usb_prim_qmpphy: phy@88e8000 {
compatible = "qcom,sc8180x-qmp-usb3-dp-phy"; compatible = "qcom,sc8180x-qmp-usb3-dp-phy";
reg = <0 0x088e9000 0 0x18c>, reg = <0 0x088e8000 0 0x3000>;
<0 0x088e8000 0 0x38>,
<0 0x088ea000 0 0x40>;
reg-names = "reg-base", "dp_com";
clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
<&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_USB3_PRIM_CLKREF_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", clock-names = "aux",
"ref_clk_src",
"ref", "ref",
"com_aux"; "com_aux",
"usb3_pipe";
resets = <&gcc GCC_USB3_DP_PHY_PRIM_SP0_BCR>, resets = <&gcc GCC_USB3_DP_PHY_PRIM_SP0_BCR>,
<&gcc GCC_USB3_PHY_PRIM_SP0_BCR>; <&gcc GCC_USB3_PHY_PRIM_SP0_BCR>;
reset-names = "phy", "common"; reset-names = "phy", "common";
#clock-cells = <1>; #clock-cells = <1>;
#address-cells = <2>; #phy-cells = <1>;
#size-cells = <2>;
ranges;
status = "disabled"; status = "disabled";
...@@ -2541,59 +2539,38 @@ port@0 { ...@@ -2541,59 +2539,38 @@ port@0 {
usb_prim_qmpphy_out: endpoint {}; usb_prim_qmpphy_out: endpoint {};
}; };
port@1 {
reg = <1>;
usb_prim_qmpphy_usb_ss_in: endpoint {};
};
port@2 { port@2 {
reg = <2>; reg = <2>;
usb_prim_qmpphy_dp_in: endpoint {}; 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 { usb_sec_qmpphy: phy@88ee000 {
compatible = "qcom,sc8180x-qmp-usb3-dp-phy"; compatible = "qcom,sc8180x-qmp-usb3-dp-phy";
reg = <0 0x088ee000 0 0x18c>, reg = <0 0x088ed000 0 0x3000>;
<0 0x088ed000 0 0x10>,
<0 0x088ef000 0 0x40>;
reg-names = "reg-base", "dp_com";
clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>, clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>,
<&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_USB3_SEC_CLKREF_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", clock-names = "aux",
"ref_clk_src",
"ref", "ref",
"com_aux"; "com_aux",
"usb3_pipe";
resets = <&gcc GCC_USB3_DP_PHY_SEC_BCR>, resets = <&gcc GCC_USB3_DP_PHY_SEC_BCR>,
<&gcc GCC_USB3_PHY_SEC_BCR>; <&gcc GCC_USB3_PHY_SEC_BCR>;
reset-names = "phy", "common"; reset-names = "phy", "common";
#clock-cells = <1>; #clock-cells = <1>;
#address-cells = <2>; #phy-cells = <1>;
#size-cells = <2>;
ranges;
status = "disabled"; status = "disabled";
...@@ -2607,37 +2584,18 @@ port@0 { ...@@ -2607,37 +2584,18 @@ port@0 {
usb_sec_qmpphy_out: endpoint {}; usb_sec_qmpphy_out: endpoint {};
}; };
port@1 {
reg = <1>;
usb_sec_qmpphy_usb_ss_in: endpoint {};
};
port@2 { port@2 {
reg = <2>; reg = <2>;
usb_sec_qmpphy_dp_in: endpoint {}; 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 { system-cache-controller@9200000 {
...@@ -2706,7 +2664,7 @@ usb_prim_dwc3: usb@a600000 { ...@@ -2706,7 +2664,7 @@ usb_prim_dwc3: usb@a600000 {
iommus = <&apps_smmu 0x140 0>; iommus = <&apps_smmu 0x140 0>;
snps,dis_u2_susphy_quirk; snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_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"; phy-names = "usb2-phy", "usb3-phy";
port { port {
...@@ -2763,7 +2721,7 @@ usb_sec_dwc3: usb@a800000 { ...@@ -2763,7 +2721,7 @@ usb_sec_dwc3: usb@a800000 {
iommus = <&apps_smmu 0x160 0>; iommus = <&apps_smmu 0x160 0>;
snps,dis_u2_susphy_quirk; snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_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"; phy-names = "usb2-phy", "usb3-phy";
port { port {
...@@ -3081,9 +3039,10 @@ mdss_dp0: displayport-controller@ae90000 { ...@@ -3081,9 +3039,10 @@ mdss_dp0: displayport-controller@ae90000 {
assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>, assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>,
<&dispcc DISP_CC_MDSS_DP_PIXEL_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"; phy-names = "dp";
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
...@@ -3158,9 +3117,10 @@ mdss_dp1: displayport-controller@ae98000 { ...@@ -3158,9 +3117,10 @@ mdss_dp1: displayport-controller@ae98000 {
assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK1_CLK_SRC>, assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK1_CLK_SRC>,
<&dispcc DISP_CC_MDSS_DP_PIXEL2_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"; phy-names = "dp";
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
...@@ -3307,12 +3267,12 @@ dispcc: clock-controller@af00000 { ...@@ -3307,12 +3267,12 @@ dispcc: clock-controller@af00000 {
<&mdss_dsi0_phy 1>, <&mdss_dsi0_phy 1>,
<&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 0>,
<&mdss_dsi1_phy 1>, <&mdss_dsi1_phy 1>,
<&usb_prim_dpphy 0>, <&usb_prim_qmpphy QMP_USB43DP_DP_LINK_CLK>,
<&usb_prim_dpphy 1>, <&usb_prim_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>,
<&edp_phy 0>, <&edp_phy 0>,
<&edp_phy 1>, <&edp_phy 1>,
<&usb_sec_dpphy 0>, <&usb_sec_qmpphy QMP_USB43DP_DP_LINK_CLK>,
<&usb_sec_dpphy 1>; <&usb_sec_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>;
clock-names = "bi_tcxo", clock-names = "bi_tcxo",
"dsi0_phy_pll_out_byteclk", "dsi0_phy_pll_out_byteclk",
"dsi0_phy_pll_out_dsiclk", "dsi0_phy_pll_out_dsiclk",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7