From d9cefd38d3bae229ef7b22184e429a9aa4be2bd8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 13 Jun 2016 07:31:09 +0200 Subject: dts: update to v4.6-rc6 Signed-off-by: Sascha Hauer --- dts/Bindings/arc/archs-pct.txt | 2 +- dts/Bindings/arc/pct.txt | 2 +- dts/Bindings/arm/cpus.txt | 1 - dts/Bindings/i2c/i2c-rk3x.txt | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'dts/Bindings') diff --git a/dts/Bindings/arc/archs-pct.txt b/dts/Bindings/arc/archs-pct.txt index 1ae98b87c6..e4b9dcee6d 100644 --- a/dts/Bindings/arc/archs-pct.txt +++ b/dts/Bindings/arc/archs-pct.txt @@ -2,7 +2,7 @@ The ARC HS can be configured with a pipeline performance monitor for counting CPU and cache events like cache misses and hits. Like conventional PCT there -are 100+ hardware conditions dynamically mapped to upto 32 counters. +are 100+ hardware conditions dynamically mapped to up to 32 counters. It also supports overflow interrupts. Required properties: diff --git a/dts/Bindings/arc/pct.txt b/dts/Bindings/arc/pct.txt index 7b9588444f..4e874d9a38 100644 --- a/dts/Bindings/arc/pct.txt +++ b/dts/Bindings/arc/pct.txt @@ -2,7 +2,7 @@ The ARC700 can be configured with a pipeline performance monitor for counting CPU and cache events like cache misses and hits. Like conventional PCT there -are 100+ hardware conditions dynamically mapped to upto 32 counters +are 100+ hardware conditions dynamically mapped to up to 32 counters Note that: * The ARC 700 PCT does not support interrupts; although HW events may be diff --git a/dts/Bindings/arm/cpus.txt b/dts/Bindings/arm/cpus.txt index ccc62f1453..3f0cbbb839 100644 --- a/dts/Bindings/arm/cpus.txt +++ b/dts/Bindings/arm/cpus.txt @@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. can be one of: "allwinner,sun6i-a31" "allwinner,sun8i-a23" - "arm,psci" "arm,realview-smp" "brcm,bcm-nsp-smp" "brcm,brahma-b15" diff --git a/dts/Bindings/i2c/i2c-rk3x.txt b/dts/Bindings/i2c/i2c-rk3x.txt index f0d71bc52e..0b4a85fe2d 100644 --- a/dts/Bindings/i2c/i2c-rk3x.txt +++ b/dts/Bindings/i2c/i2c-rk3x.txt @@ -6,8 +6,8 @@ RK3xxx SoCs. Required properties : - reg : Offset and length of the register set for the device - - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or - "rockchip,rk3288-i2c". + - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c", + "rockchip,rk3228-i2c" or "rockchip,rk3288-i2c". - interrupts : interrupt number - clocks : parent clock -- cgit v1.2.3