ARM: tegra: Add cooling cells to ACTMON device-tree node

The ACTMON module monitors activity of memory clients and decisions
about a minimum required memory frequency are made based on info from
ACTMON. Add cooling cells to ACTMON device-tree node in order to turn
it into a cooling device that will throttle memory freq on overheat.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 0b678afb2a5ccff410dc90d242c4240f13997c32..8b38f123f55428bbe26bc1742076620eed51e51a 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -283,7 +283,7 @@
                reg = <0x0 0x60007000 0x0 0x1000>;
        };
 
-       actmon@6000c800 {
+       actmon: actmon@6000c800 {
                compatible = "nvidia,tegra124-actmon";
                reg = <0x0 0x6000c800 0x0 0x400>;
                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -295,6 +295,7 @@
                operating-points-v2 = <&emc_bw_dfs_opp_table>;
                interconnects = <&mc TEGRA124_MC_MPCORER &emc>;
                interconnect-names = "cpu-read";
+               #cooling-cells = <2>;
        };
 
        gpio: gpio@6000d000 {

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 44a6dbba708181cb75e499b6112189ff39ea157c..c577c191be4bbf4e308569a666baf52af1d6371f 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -410,7 +410,7 @@
                reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
        };
 
-       actmon@6000c800 {
+       actmon: actmon@6000c800 {
                compatible = "nvidia,tegra30-actmon";
                reg = <0x6000c800 0x400>;
                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -422,6 +422,7 @@
                operating-points-v2 = <&emc_bw_dfs_opp_table>;
                interconnects = <&mc TEGRA30_MC_MPCORER &emc>;
                interconnect-names = "cpu-read";
+               #cooling-cells = <2>;
        };
 
        gpio: gpio@6000d000 {