Commit 4a8fbb7c authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson

arm64: dts: qcom: sc7280: switch PCIe QMP PHY to new style of bindings

Change the PCIe QMP PHY to use newer style of QMP PHY bindings (single
resource region, no per-PHY subnodes).
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230820142035.89903-12-dmitry.baryshkov@linaro.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 8b4a3d42
...@@ -905,7 +905,7 @@ gcc: clock-controller@100000 { ...@@ -905,7 +905,7 @@ gcc: clock-controller@100000 {
reg = <0 0x00100000 0 0x1f0000>; reg = <0 0x00100000 0 0x1f0000>;
clocks = <&rpmhcc RPMH_CXO_CLK>, clocks = <&rpmhcc RPMH_CXO_CLK>,
<&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>, <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>,
<0>, <&pcie1_lane>, <0>, <&pcie1_phy>,
<0>, <0>, <0>, <0>, <0>, <0>,
<&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>; <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>;
clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk", clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk",
...@@ -2157,7 +2157,7 @@ pcie1: pci@1c08000 { ...@@ -2157,7 +2157,7 @@ pcie1: pci@1c08000 {
clocks = <&gcc GCC_PCIE_1_PIPE_CLK>, clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
<&gcc GCC_PCIE_1_PIPE_CLK_SRC>, <&gcc GCC_PCIE_1_PIPE_CLK_SRC>,
<&pcie1_lane>, <&pcie1_phy>,
<&rpmhcc RPMH_CXO_CLK>, <&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_PCIE_1_AUX_CLK>, <&gcc GCC_PCIE_1_AUX_CLK>,
<&gcc GCC_PCIE_1_CFG_AHB_CLK>, <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
...@@ -2191,7 +2191,7 @@ pcie1: pci@1c08000 { ...@@ -2191,7 +2191,7 @@ pcie1: pci@1c08000 {
power-domains = <&gcc GCC_PCIE_1_GDSC>; power-domains = <&gcc GCC_PCIE_1_GDSC>;
phys = <&pcie1_lane>; phys = <&pcie1_phy>;
phy-names = "pciephy"; phy-names = "pciephy";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -2207,15 +2207,22 @@ pcie1: pci@1c08000 { ...@@ -2207,15 +2207,22 @@ pcie1: pci@1c08000 {
pcie1_phy: phy@1c0e000 { pcie1_phy: phy@1c0e000 {
compatible = "qcom,sm8250-qmp-gen3x2-pcie-phy"; compatible = "qcom,sm8250-qmp-gen3x2-pcie-phy";
reg = <0 0x01c0e000 0 0x1c0>; reg = <0 0x01c0e000 0 0x1000>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
clocks = <&gcc GCC_PCIE_1_AUX_CLK>, clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
<&gcc GCC_PCIE_1_CFG_AHB_CLK>, <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
<&gcc GCC_PCIE_CLKREF_EN>, <&gcc GCC_PCIE_CLKREF_EN>,
<&gcc GCC_PCIE1_PHY_RCHNG_CLK>; <&gcc GCC_PCIE1_PHY_RCHNG_CLK>,
clock-names = "aux", "cfg_ahb", "ref", "refgen"; <&gcc GCC_PCIE_1_PIPE_CLK>;
clock-names = "aux",
"cfg_ahb",
"ref",
"refgen",
"pipe";
clock-output-names = "pcie_1_pipe_clk";
#clock-cells = <0>;
#phy-cells = <0>;
resets = <&gcc GCC_PCIE_1_PHY_BCR>; resets = <&gcc GCC_PCIE_1_PHY_BCR>;
reset-names = "phy"; reset-names = "phy";
...@@ -2224,21 +2231,6 @@ pcie1_phy: phy@1c0e000 { ...@@ -2224,21 +2231,6 @@ pcie1_phy: phy@1c0e000 {
assigned-clock-rates = <100000000>; assigned-clock-rates = <100000000>;
status = "disabled"; status = "disabled";
pcie1_lane: phy@1c0e200 {
reg = <0 0x01c0e200 0 0x170>,
<0 0x01c0e400 0 0x200>,
<0 0x01c0ea00 0 0x1f0>,
<0 0x01c0e600 0 0x170>,
<0 0x01c0e800 0 0x200>,
<0 0x01c0ee00 0 0xf4>;
clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
clock-names = "pipe0";
#phy-cells = <0>;
#clock-cells = <0>;
clock-output-names = "pcie_1_pipe_clk";
};
}; };
ipa: ipa@1e40000 { ipa: ipa@1e40000 {
......
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