summaryrefslogtreecommitdiffstats
path: root/dts/Bindings/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-09 07:36:45 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-09 07:36:45 +0200
commitd5c3f9da59ea3b95e75fb507b114dac6656d0c50 (patch)
tree3f97ac23ba81c29271b791f42ead51cb49a3ea32 /dts/Bindings/arm
parent00e5e81a1d0c6cbbb861502aae29262a4138e8e7 (diff)
downloadbarebox-d5c3f9da59ea3b95e75fb507b114dac6656d0c50.tar.gz
barebox-d5c3f9da59ea3b95e75fb507b114dac6656d0c50.tar.xz
dts: update to v3.16-rc3
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings/arm')
-rw-r--r--dts/Bindings/arm/armada-38x.txt14
-rw-r--r--dts/Bindings/arm/l2cc.txt3
-rw-r--r--dts/Bindings/arm/samsung/exynos-adc.txt2
3 files changed, 16 insertions, 3 deletions
diff --git a/dts/Bindings/arm/armada-38x.txt b/dts/Bindings/arm/armada-38x.txt
index 11f2330a65..ad9f8ed4d9 100644
--- a/dts/Bindings/arm/armada-38x.txt
+++ b/dts/Bindings/arm/armada-38x.txt
@@ -6,5 +6,15 @@ following property:
Required root node property:
- - compatible: must contain either "marvell,armada380" or
- "marvell,armada385" depending on the variant of the SoC being used.
+ - compatible: must contain "marvell,armada380"
+
+In addition, boards using the Marvell Armada 385 SoC shall have the
+following property before the previous one:
+
+Required root node property:
+
+compatible: must contain "marvell,armada385"
+
+Example:
+
+compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
diff --git a/dts/Bindings/arm/l2cc.txt b/dts/Bindings/arm/l2cc.txt
index b513cb8196..af527ee111 100644
--- a/dts/Bindings/arm/l2cc.txt
+++ b/dts/Bindings/arm/l2cc.txt
@@ -40,6 +40,9 @@ Optional properties:
- arm,filter-ranges : <start length> Starting address and length of window to
filter. Addresses in the filter window are directed to the M1 port. Other
addresses will go to the M0 port.
+- arm,io-coherent : indicates that the system is operating in an hardware
+ I/O coherent mode. Valid only when the arm,pl310-cache compatible
+ string is used.
- interrupts : 1 combined interrupt.
- cache-id-part: cache id part number to be used if it is not present
on hardware
diff --git a/dts/Bindings/arm/samsung/exynos-adc.txt b/dts/Bindings/arm/samsung/exynos-adc.txt
index 5d49f2b37f..832fe8cc24 100644
--- a/dts/Bindings/arm/samsung/exynos-adc.txt
+++ b/dts/Bindings/arm/samsung/exynos-adc.txt
@@ -48,7 +48,7 @@ adc@12D10000 {
/* NTC thermistor is a hwmon device */
ncp15wb473@0 {
- compatible = "ntc,ncp15wb473";
+ compatible = "murata,ncp15wb473";
pullup-uv = <1800000>;
pullup-ohm = <47000>;
pulldown-ohm = <0>;