From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 19 Apr 2021 15:41:49 +0000 (+0200)
Subject: Merge branch 'arm/dt' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6eb85de925e2b44b494670f782dcca778e942c0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'arm/dt' into for-next

* arm/dt:
  arm64: dts: qcom: sc7180: Update iommu property for simultaneous playback
  arm64: dts: qcom: sc7180: pompom: Add "dmic_clk_en" + sound model
  arm64: dts: qcom: sc7180: coachz: Add "dmic_clk_en"
  ARM: dts: qcom: sdx55: add IPA information
  ARM: dts: qcom: sdx55: Add basic devicetree support for Thundercomm T55
  dt-bindings: arm: qcom: Add binding for Thundercomm T55 kit
  ARM: dts: qcom: sdx55: Add basic devicetree support for Telit FN980 TLB
  dt-bindings: arm: qcom: Add binding for Telit FN980 TLB board
  ARM: dts: qcom: sdx55: Add Modem remoteproc node
  ARM: dts: qcom: Fix node name for NAND controller node
  ARM: dts: qcom: sdx55: Add interconnect nodes
  ARM: dts: qcom: sdx55: Add SCM node
  dt-bindings: firmware: scm: Add compatible for SDX55
  ARM: dts: qcom: sdx55: Add IMEM and PIL info region
  ARM: dts: qcom: sdx55: Add modem SMP2P node
  ARM: dts: qcom: sdx55: Add CPUFreq support
  ARM: dts: qcom: sdx55: Add support for APCS block
  ARM: dts: qcom: sdx55: Add support for A7 PLL clock
---

b6eb85de925e2b44b494670f782dcca778e942c0
diff --cc Documentation/devicetree/bindings/firmware/qcom,scm.txt
index 1edc31165d236,10281ae6e1b6b..e747d73687cbe
--- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt
+++ b/Documentation/devicetree/bindings/firmware/qcom,scm.txt
@@@ -20,8 -20,8 +20,9 @@@ Required properties
   * "qcom,scm-msm8996"
   * "qcom,scm-msm8998"
   * "qcom,scm-sc7180"
 + * "qcom,scm-sc7280"
   * "qcom,scm-sdm845"
+  * "qcom,scm-sdx55"
   * "qcom,scm-sm8150"
   * "qcom,scm-sm8250"
   * "qcom,scm-sm8350"