diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:07:43 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:07:43 -0300 |
| commit | 19ac7f0d6628d1b5b5a6a7cfb82f979f8c4184bf (patch) | |
| tree | ad7b33c2146ec4f7603d9f7b3f862be16b0ddc15 /Documentation/devicetree/bindings/soc | |
| parent | dea6099cfa067a92ac4e786303cc3ce6eb85e7fd (diff) | |
| parent | 843dae1756d9bddee21a96827784791fd97d484e (diff) | |
Merge tag 'v5.15.54' into 5.15-2.1.x-imx
This is the 5.15.54 stable release
Conflicts:
arch/arm64/boot/dts/freescale/imx8mp-evk.dts
MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR renamed to
MX8MP_IOMUXC_GPIO1_IO14__USB2_PWR
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'Documentation/devicetree/bindings/soc')
| -rw-r--r-- | Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml index cc3fe5ed7421..1b0062e3c1a4 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml @@ -34,6 +34,8 @@ properties: - qcom,rpm-ipq6018 - qcom,rpm-msm8226 - qcom,rpm-msm8916 + - qcom,rpm-msm8936 + - qcom,rpm-msm8953 - qcom,rpm-msm8974 - qcom,rpm-msm8976 - qcom,rpm-msm8996 @@ -57,6 +59,7 @@ if: - qcom,rpm-apq8084 - qcom,rpm-msm8916 - qcom,rpm-msm8974 + - qcom,rpm-msm8953 then: required: - qcom,smd-channels |