diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-09-15 01:27:28 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-09-15 01:27:28 +0200 |
| commit | a2a2b8215621536a7620e31f36bede81bb86680b (patch) | |
| tree | 94b2bcedaac82c999041e1e7b281ce46ed9f429f /arch/arm/boot/dts/dra7.dtsi | |
| parent | ARM: dts: omap3-gta04: reduce panel backlight PWM frequency to 83Hz (diff) | |
| parent | Revert "ARM: dts: dra7: Move to operating-points-v2 table" (diff) | |
| download | linux-a2a2b8215621536a7620e31f36bede81bb86680b.tar.xz linux-a2a2b8215621536a7620e31f36bede81bb86680b.zip | |
Merge branch 'am335x-cpufreq-regression' into omap-for-v4.9/dt-v2
Diffstat (limited to 'arch/arm/boot/dts/dra7.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 147df90d2126..d4fcd68f6349 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -80,9 +80,11 @@ compatible = "arm,cortex-a15"; reg = <0>; - operating-points-v2 = <&cpu0_opp_table>; - ti,syscon-efuse = <&scm_wkup 0x20c 0xf80000 19>; - ti,syscon-rev = <&scm_wkup 0x204>; + operating-points = < + /* kHz uV */ + 1000000 1060000 + 1176000 1160000 + >; clocks = <&dpll_mpu_ck>; clock-names = "cpu"; @@ -96,24 +98,6 @@ }; }; - cpu0_opp_table: opp_table0 { - compatible = "operating-points-v2"; - opp-shared; - - opp_nom@1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt = <1060000 850000 1150000>; - opp-supported-hw = <0xFF 0x01>; - opp-suspend; - }; - - opp_od@1176000000 { - opp-hz = /bits/ 64 <1176000000>; - opp-microvolt = <1160000 885000 1160000>; - opp-supported-hw = <0xFF 0x02>; - }; - }; - /* * The soc node represents the soc top level view. It is used for IPs * that are not memory mapped in the MPU view or for the MPU itself. |