Skip to content

Commit

Permalink
Revert "ARM: dts: dra7: Move to operating-points-v2 table"
Browse files Browse the repository at this point in the history
This reverts commit f80bc97.

The original commit updated the cpufreq operating points tables for
dra7xx but was merged before the driver making use of the node was
merged, which breaks the existing cpufreq implementation on the system,
so revert the patch until the ti-cpufreq driver is merged.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Dave Gerlach authored and Tony Lindgren committed Sep 14, 2016
1 parent 0f416d1 commit a8dc7cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 22 deletions.
26 changes: 5 additions & 21 deletions arch/arm/boot/dts/dra7.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,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";
Expand All @@ -98,24 +100,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.
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/dra74x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <1>;
operating-points-v2 = <&cpu0_opp_table>;
};
};

Expand Down

0 comments on commit a8dc7cb

Please sign in to comment.