diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-12-03 14:47:14 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-12-03 14:47:14 +0000 |
| commit | f23e3513fdfe2d62546159734ceea715eb4e9672 (patch) | |
| tree | 6c289c1092ccbf92c04ed5711ac4558aa8f0fe92 /arch/arm64/boot/dts/arm/juno-base.dtsi | |
| parent | 1ca10b017c597b5363d4aa678b80586d87be4146 (diff) | |
| parent | 03d70cf08c9efbcaefa52e8c1f7f3a4824f61e2a (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20151203
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'arch/arm64/boot/dts/arm/juno-base.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index a1376854cbe5..1e4175253b94 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -234,6 +234,15 @@ interrupt-names = "JOB", "MMU", "GPU"; clocks = <&scpi_dvfs 2>; clock-names = "clk_mali"; + power_model { + compatible = "arm,mali-simple-power-model"; + voltage = <800>; + frequency = <500>; + static-power = <500>; + dynamic-power = <1500>; + ts = <20000 2000 (-20) 2>; + thermal-zone = "gpu"; + }; }; soc_i2s: i2s@7ff90000 { |