Commit 29cf2ee3 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'qcom-arm64-for-5.1' of...

Merge tag 'qcom-arm64-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt

Qualcomm ARM64 Updates for v5.1

* Add thermal trip points to cpufreq
* Add SDM845 IOMMU info for SDHC, USB, and WLAN
* Fix MSM8916 clock cell argument

* tag 'qcom-arm64-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: sdm845: Fixup dependency on RPMPD includes
  arm64: dts: sdm845: Add clocks and iommus to WCN3990 WLAN node
  arm64: dts: qcom: sdm845: Define iommus for USB controllers
  arm64: dts: qcom: sdm845: Define IOMMU for sdhc 2
  arm64: dts: sdm845: wireup the thermal trip points to cpufreq
  arm64: dts: msm8916: remove bogus argument to the cpu clock

[arnd: I've pulled the earlier branch again after an update, this
 adds the stuff listed above, and fixes a build error from the missing
 dependency, as I requested]
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0fe8f1e5 08585d21
...@@ -111,7 +111,7 @@ CPU0: cpu@0 { ...@@ -111,7 +111,7 @@ CPU0: cpu@0 {
next-level-cache = <&L2_0>; next-level-cache = <&L2_0>;
enable-method = "psci"; enable-method = "psci";
cpu-idle-states = <&CPU_SPC>; cpu-idle-states = <&CPU_SPC>;
clocks = <&apcs 0>; clocks = <&apcs>;
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
...@@ -123,7 +123,7 @@ CPU1: cpu@1 { ...@@ -123,7 +123,7 @@ CPU1: cpu@1 {
next-level-cache = <&L2_0>; next-level-cache = <&L2_0>;
enable-method = "psci"; enable-method = "psci";
cpu-idle-states = <&CPU_SPC>; cpu-idle-states = <&CPU_SPC>;
clocks = <&apcs 0>; clocks = <&apcs>;
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
...@@ -135,7 +135,7 @@ CPU2: cpu@2 { ...@@ -135,7 +135,7 @@ CPU2: cpu@2 {
next-level-cache = <&L2_0>; next-level-cache = <&L2_0>;
enable-method = "psci"; enable-method = "psci";
cpu-idle-states = <&CPU_SPC>; cpu-idle-states = <&CPU_SPC>;
clocks = <&apcs 0>; clocks = <&apcs>;
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
...@@ -147,7 +147,7 @@ CPU3: cpu@3 { ...@@ -147,7 +147,7 @@ CPU3: cpu@3 {
next-level-cache = <&L2_0>; next-level-cache = <&L2_0>;
enable-method = "psci"; enable-method = "psci";
cpu-idle-states = <&CPU_SPC>; cpu-idle-states = <&CPU_SPC>;
clocks = <&apcs 0>; clocks = <&apcs>;
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
......
This diff is collapsed.
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