summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun8i-a33.dtsi
diff options
context:
space:
mode:
authorDave Airlie2017-04-19 03:07:14 +0200
committerDave Airlie2017-04-19 03:07:14 +0200
commit856ee92e8602bd86d34388ac08381c5cb3918756 (patch)
treec3bed2bf85214f78239724adb34a1c2d6ec8444d /arch/arm/boot/dts/sun8i-a33.dtsi
parentMerge tag 'drm-misc-next-fixes-2017-04-12' of git://anongit.freedesktop.org/g... (diff)
parentLinux 4.11-rc7 (diff)
downloadkernel-qcow2-linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.gz
kernel-qcow2-linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz
kernel-qcow2-linux-856ee92e8602bd86d34388ac08381c5cb3918756.zip
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some conflicts that were causing problems with the rerere cache in drm-tip.
Diffstat (limited to 'arch/arm/boot/dts/sun8i-a33.dtsi')
-rw-r--r--arch/arm/boot/dts/sun8i-a33.dtsi12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 0467fb365bfc..306af6cadf26 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -66,12 +66,6 @@
opp-microvolt = <1200000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
-
- opp@1200000000 {
- opp-hz = /bits/ 64 <1200000000>;
- opp-microvolt = <1320000>;
- clock-latency-ns = <244144>; /* 8 32k periods */
- };
};
cpus {
@@ -81,16 +75,22 @@
operating-points-v2 = <&cpu0_opp_table>;
};
+ cpu@1 {
+ operating-points-v2 = <&cpu0_opp_table>;
+ };
+
cpu@2 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <2>;
+ operating-points-v2 = <&cpu0_opp_table>;
};
cpu@3 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <3>;
+ operating-points-v2 = <&cpu0_opp_table>;
};
};