git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 94c34600b6173a2b9dd7d9694a42d86fb8768e62 Mon Sep 17 00:00:00 2001
   2 From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
   3 Date: Wed, 31 Mar 2021 18:16:08 +0300
   4 Subject: dt-bindings: phy: qcom,qmp-usb3-dp-phy: move usb3 compatibles back to qcom,qmp-phy.yaml
   5
   6 From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
   7
   8 commit 94c34600b6173a2b9dd7d9694a42d86fb8768e62 upstream.
   9
  10 The commit 724fabf5df13 ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy
  11 information") has support for DP part of USB3+DP combo PHYs. However
  12 this change is not backwards compatible, placing additional requirements
  13 onto qcom,sc7180-qmp-usb3-phy and qcom,sdm845-qmp-usb3-phy device nodes
  14 (to include separate DP part, etc). However the aforementioned nodes do
  15 not inclue DP part, they strictly follow the schema defined in the
  16 qcom,qmp-phy.yaml file. Move those compatibles, leaving
  17 qcom,qmp-usb3-dp-phy.yaml to describe only real "combo" USB3+DP device nodes.
  18
  19 Fixes: 724fabf5df13 ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information")
  20 Cc: Stephen Boyd <swboyd@chromium.org>
  21 Cc: Sandeep Maheswaram <sanm@codeaurora.org>
  22 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  23 Acked-by: Rob Herring <robh@kernel.org>
  24 Reviewed-by: Stephen Boyd <swboyd@chromium.org>
  25 Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  26 Link: https://lore.kernel.org/r/20210331151614.3810197-2-dmitry.baryshkov@linaro.org
  27 Signed-off-by: Vinod Koul <vkoul@kernel.org>
  28 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  29 ---
  30  Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml         |    2 ++
  31  Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml |    2 --
  32  2 files changed, 2 insertions(+), 2 deletions(-)
  33
  34 --- a/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
  35 +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
  36 @@ -25,11 +25,13 @@ properties:
  37        - qcom,msm8998-qmp-pcie-phy
  38        - qcom,msm8998-qmp-ufs-phy
  39        - qcom,msm8998-qmp-usb3-phy
  40 +      - qcom,sc7180-qmp-usb3-phy
  41        - qcom,sc8180x-qmp-ufs-phy
  42        - qcom,sc8180x-qmp-usb3-phy
  43        - qcom,sdm845-qhp-pcie-phy
  44        - qcom,sdm845-qmp-pcie-phy
  45        - qcom,sdm845-qmp-ufs-phy
  46 +      - qcom,sdm845-qmp-usb3-phy
  47        - qcom,sdm845-qmp-usb3-uni-phy
  48        - qcom,sm8150-qmp-ufs-phy
  49        - qcom,sm8150-qmp-usb3-phy
  50 --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
  51 +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
  52 @@ -14,9 +14,7 @@ properties:
  53    compatible:
  54      enum:
  55        - qcom,sc7180-qmp-usb3-dp-phy
  56 -      - qcom,sc7180-qmp-usb3-phy
  57        - qcom,sdm845-qmp-usb3-dp-phy
  58 -      - qcom,sdm845-qmp-usb3-phy
  59    reg:
  60      items:
  61        - description: Address and length of PHY's USB serdes block.