summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-11-09 04:02:01 (GMT)
committerAlex Shi <alex.shi@linaro.org>2017-11-09 04:02:01 (GMT)
commit3871608e4cb995b0fb9c630da9ac45b246151fef (patch)
tree1a7d65ae9b815e73ec9ffe00d6a3778ab66d5dc8 /Documentation
parentd177d7df2673ea81e8ee1e3d468398eeb7e580f5 (diff)
parent5caae9d1419914177994363218616b869659e871 (diff)
downloadlinux-3871608e4cb995b0fb9c630da9ac45b246151fef.tar.xz
Merge tag 'v4.9.61' into linux-linaro-lsk-v4.9
This is the 4.9.61 stable release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/arch_timer.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index ad440a2..e926aea 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -31,6 +31,12 @@ to deliver its interrupts via SPIs.
This also affects writes to the tval register, due to the implicit
counter read.
+- hisilicon,erratum-161010101 : A boolean property. Indicates the
+ presence of Hisilicon erratum 161010101, which says that reading the
+ counters is unreliable in some cases, and reads may return a value 32
+ beyond the correct value. This also affects writes to the tval
+ registers, due to the implicit counter read.
+
** Optional properties:
- arm,cpu-registers-not-fw-configured : Firmware does not initialize