summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Rowand <frank.rowand@sony.com>2017-06-22 12:15:39 -0400
committerRob Herring <robh@kernel.org>2017-06-22 12:22:06 -0400
commit076fb0c4b6e1f6883477d1e4ee89464924e64737 (patch)
tree0ce0d0baecb6ed6e68129360a7283ca3f211228a
parent7782b1444645768f5f213eaff6994604c6c0e635 (diff)
of: update ePAPR references to point to Devicetree Specification
The Devicetree Specification has superseded the ePAPR as the base specification for bindings. Update files in Documentation to reference the new document. First reference to ePAPR in Documentation/devicetree/bindings/arm/cci.txt is generic, remove it. Some files are not updated because there is no hypervisor chapter in the Devicetree Specification: Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt Documenation/virtual/kvm/api.txt Documenation/virtual/kvm/ppc-pv.txt Signed-off-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/arm/cci.txt15
-rw-r--r--Documentation/devicetree/bindings/arm/cpus.txt13
-rw-r--r--Documentation/devicetree/bindings/arm/idle-states.txt4
-rw-r--r--Documentation/devicetree/bindings/arm/l2c2x0.txt4
-rw-r--r--Documentation/devicetree/bindings/arm/topology.txt4
-rw-r--r--Documentation/devicetree/bindings/bus/simple-pm-bus.txt2
-rw-r--r--Documentation/devicetree/bindings/chosen.txt3
-rw-r--r--Documentation/devicetree/bindings/common-properties.txt2
-rw-r--r--Documentation/devicetree/bindings/crypto/fsl-sec4.txt4
-rw-r--r--Documentation/devicetree/bindings/crypto/fsl-sec6.txt4
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/open-pic.txt5
-rw-r--r--Documentation/devicetree/bindings/net/ethernet.txt9
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/cpus.txt6
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt2
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt4
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/srio.txt3
-rw-r--r--Documentation/devicetree/booting-without-of.txt2
-rw-r--r--Documentation/devicetree/usage-model.txt2
-rw-r--r--Documentation/xtensa/mmu.txt6
19 files changed, 46 insertions, 48 deletions
diff --git a/Documentation/devicetree/bindings/arm/cci.txt b/Documentation/devicetree/bindings/arm/cci.txt
index 0f2153e8fa7e..9600761f2d5b 100644
--- a/Documentation/devicetree/bindings/arm/cci.txt
+++ b/Documentation/devicetree/bindings/arm/cci.txt
@@ -11,13 +11,6 @@ clusters, through memory mapped interface, with a global control register
11space and multiple sets of interface control registers, one per slave 11space and multiple sets of interface control registers, one per slave
12interface. 12interface.
13 13
14Bindings for the CCI node follow the ePAPR standard, available from:
15
16www.power.org/documentation/epapr-version-1-1/
17
18with the addition of the bindings described in this document which are
19specific to ARM.
20
21* CCI interconnect node 14* CCI interconnect node
22 15
23 Description: Describes a CCI cache coherent Interconnect component 16 Description: Describes a CCI cache coherent Interconnect component
@@ -50,10 +43,10 @@ specific to ARM.
50 as a tuple of cells, containing child address, 43 as a tuple of cells, containing child address,
51 parent address and the size of the region in the 44 parent address and the size of the region in the
52 child address space. 45 child address space.
53 Definition: A standard property. Follow rules in the ePAPR for 46 Definition: A standard property. Follow rules in the Devicetree
54 hierarchical bus addressing. CCI interfaces 47 Specification for hierarchical bus addressing. CCI
55 addresses refer to the parent node addressing 48 interfaces addresses refer to the parent node
56 scheme to declare their register bases. 49 addressing scheme to declare their register bases.
57 50
58 CCI interconnect node can define the following child nodes: 51 CCI interconnect node can define the following child nodes:
59 52
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 1030f5f50207..283c520a2224 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -6,9 +6,9 @@ The device tree allows to describe the layout of CPUs in a system through
6the "cpus" node, which in turn contains a number of subnodes (ie "cpu") 6the "cpus" node, which in turn contains a number of subnodes (ie "cpu")
7defining properties for every cpu. 7defining properties for every cpu.
8 8
9Bindings for CPU nodes follow the ePAPR v1.1 standard, available from: 9Bindings for CPU nodes follow the Devicetree Specification, available from:
10 10
11https://www.power.org/documentation/epapr-version-1-1/ 11https://www.devicetree.org/specifications/
12 12
13with updates for 32-bit and 64-bit ARM systems provided in this document. 13with updates for 32-bit and 64-bit ARM systems provided in this document.
14 14
@@ -16,8 +16,8 @@ with updates for 32-bit and 64-bit ARM systems provided in this document.
16Convention used in this document 16Convention used in this document
17================================ 17================================
18 18
19This document follows the conventions described in the ePAPR v1.1, with 19This document follows the conventions described in the Devicetree
20the addition: 20Specification, with the addition:
21 21
22- square brackets define bitfields, eg reg[7:0] value of the bitfield in 22- square brackets define bitfields, eg reg[7:0] value of the bitfield in
23 the reg property contained in bits 7 down to 0 23 the reg property contained in bits 7 down to 0
@@ -26,8 +26,9 @@ the addition:
26cpus and cpu node bindings definition 26cpus and cpu node bindings definition
27===================================== 27=====================================
28 28
29The ARM architecture, in accordance with the ePAPR, requires the cpus and cpu 29The ARM architecture, in accordance with the Devicetree Specification,
30nodes to be present and contain the properties described below. 30requires the cpus and cpu nodes to be present and contain the properties
31described below.
31 32
32- cpus node 33- cpus node
33 34
diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt
index b8e41c148a3c..7a591333f2b1 100644
--- a/Documentation/devicetree/bindings/arm/idle-states.txt
+++ b/Documentation/devicetree/bindings/arm/idle-states.txt
@@ -695,5 +695,5 @@ cpus {
695[4] ARM Architecture Reference Manuals 695[4] ARM Architecture Reference Manuals
696 http://infocenter.arm.com/help/index.jsp 696 http://infocenter.arm.com/help/index.jsp
697 697
698[5] ePAPR standard 698[5] Devicetree Specification
699 https://www.power.org/documentation/epapr-version-1-1/ 699 https://www.devicetree.org/specifications/
diff --git a/Documentation/devicetree/bindings/arm/l2c2x0.txt b/Documentation/devicetree/bindings/arm/l2c2x0.txt
index d9650c1788f4..fbe6cb21f4cf 100644
--- a/Documentation/devicetree/bindings/arm/l2c2x0.txt
+++ b/Documentation/devicetree/bindings/arm/l2c2x0.txt
@@ -4,8 +4,8 @@ ARM cores often have a separate L2C210/L2C220/L2C310 (also known as PL210/PL220/
4PL310 and variants) based level 2 cache controller. All these various implementations 4PL310 and variants) based level 2 cache controller. All these various implementations
5of the L2 cache controller have compatible programming models (Note 1). 5of the L2 cache controller have compatible programming models (Note 1).
6Some of the properties that are just prefixed "cache-*" are taken from section 6Some of the properties that are just prefixed "cache-*" are taken from section
73.7.3 of the ePAPR v1.1 specification which can be found at: 73.7.3 of the Devicetree Specification which can be found at:
8https://www.power.org/wp-content/uploads/2012/06/Power_ePAPR_APPROVED_v1.1.pdf 8https://www.devicetree.org/specifications/
9 9
10The ARM L2 cache representation in the device tree should be done as follows: 10The ARM L2 cache representation in the device tree should be done as follows:
11 11
diff --git a/Documentation/devicetree/bindings/arm/topology.txt b/Documentation/devicetree/bindings/arm/topology.txt
index 1061faf5f602..de9eb0486630 100644
--- a/Documentation/devicetree/bindings/arm/topology.txt
+++ b/Documentation/devicetree/bindings/arm/topology.txt
@@ -29,9 +29,9 @@ corresponding to the system hierarchy; syntactically they are defined as device
29tree nodes. 29tree nodes.
30 30
31The remainder of this document provides the topology bindings for ARM, based 31The remainder of this document provides the topology bindings for ARM, based
32on the ePAPR standard, available from: 32on the Devicetree Specification, available from:
33 33
34http://www.power.org/documentation/epapr-version-1-1/ 34https://www.devicetree.org/specifications/
35 35
36If not stated otherwise, whenever a reference to a cpu node phandle is made its 36If not stated otherwise, whenever a reference to a cpu node phandle is made its
37value must point to a cpu node compliant with the cpu node bindings as 37value must point to a cpu node compliant with the cpu node bindings as
diff --git a/Documentation/devicetree/bindings/bus/simple-pm-bus.txt b/Documentation/devicetree/bindings/bus/simple-pm-bus.txt
index d032237512c2..6f15037131ed 100644
--- a/Documentation/devicetree/bindings/bus/simple-pm-bus.txt
+++ b/Documentation/devicetree/bindings/bus/simple-pm-bus.txt
@@ -10,7 +10,7 @@ enabled for child devices connected to the bus (either on-SoC or externally)
10to function. 10to function.
11 11
12While "simple-pm-bus" follows the "simple-bus" set of properties, as specified 12While "simple-pm-bus" follows the "simple-bus" set of properties, as specified
13in ePAPR, it is not an extension of "simple-bus". 13in the Devicetree Specification, it is not an extension of "simple-bus".
14 14
15 15
16Required properties: 16Required properties:
diff --git a/Documentation/devicetree/bindings/chosen.txt b/Documentation/devicetree/bindings/chosen.txt
index b5e39af4ddc0..dee3f5d9df26 100644
--- a/Documentation/devicetree/bindings/chosen.txt
+++ b/Documentation/devicetree/bindings/chosen.txt
@@ -10,7 +10,8 @@ stdout-path property
10-------------------- 10--------------------
11 11
12Device trees may specify the device to be used for boot console output 12Device trees may specify the device to be used for boot console output
13with a stdout-path property under /chosen, as described in ePAPR, e.g. 13with a stdout-path property under /chosen, as described in the Devicetree
14Specification, e.g.
14 15
15/ { 16/ {
16 chosen { 17 chosen {
diff --git a/Documentation/devicetree/bindings/common-properties.txt b/Documentation/devicetree/bindings/common-properties.txt
index 3193979b1d05..697714f8d75c 100644
--- a/Documentation/devicetree/bindings/common-properties.txt
+++ b/Documentation/devicetree/bindings/common-properties.txt
@@ -1,6 +1,6 @@
1Common properties 1Common properties
2 2
3The ePAPR specification does not define any properties related to hardware 3The Devicetree Specification does not define any properties related to hardware
4byteswapping, but endianness issues show up frequently in porting Linux to 4byteswapping, but endianness issues show up frequently in porting Linux to
5different machine types. This document attempts to provide a consistent 5different machine types. This document attempts to provide a consistent
6way of handling byteswapping across drivers. 6way of handling byteswapping across drivers.
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 10a425f451fc..7aef0eae58d4 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -118,8 +118,8 @@ PROPERTIES
118 Definition: A list of clock name strings in the same order as the 118 Definition: A list of clock name strings in the same order as the
119 clocks property. 119 clocks property.
120 120
121 Note: All other standard properties (see the ePAPR) are allowed 121 Note: All other standard properties (see the Devicetree Specification)
122 but are optional. 122 are allowed but are optional.
123 123
124 124
125EXAMPLE 125EXAMPLE
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
index baf8a3c1b469..73b0eb950bb3 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
@@ -55,8 +55,8 @@ PROPERTIES
55 triplet that includes the child address, parent address, & 55 triplet that includes the child address, parent address, &
56 length. 56 length.
57 57
58 Note: All other standard properties (see the ePAPR) are allowed 58 Note: All other standard properties (see the Devicetree Specification)
59 but are optional. 59 are allowed but are optional.
60 60
61EXAMPLE 61EXAMPLE
62 crypto@a0000 { 62 crypto@a0000 {
diff --git a/Documentation/devicetree/bindings/interrupt-controller/open-pic.txt b/Documentation/devicetree/bindings/interrupt-controller/open-pic.txt
index 909a902dff85..ccbbfdc53c72 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/open-pic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/open-pic.txt
@@ -92,7 +92,6 @@ Example 2:
92 92
93* References 93* References
94 94
95[1] Power.org (TM) Standard for Embedded Power Architecture (TM) Platform 95[1] Devicetree Specification
96 Requirements (ePAPR), Version 1.0, July 2008. 96 (https://www.devicetree.org/specifications/)
97 (http://www.power.org/resources/downloads/Power_ePAPR_APPROVED_v1.0.pdf)
98 97
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index 3a6916909d90..08dd263beeb9 100644
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -8,7 +8,8 @@ The following properties are common to the Ethernet controllers:
8 property; 8 property;
9- max-speed: number, specifies maximum speed in Mbit/s supported by the device; 9- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
10- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than 10- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
11 the maximum frame size (there's contradiction in ePAPR). 11 the maximum frame size (there's contradiction in the Devicetree
12 Specification).
12- phy-mode: string, operation mode of the PHY interface. This is now a de-facto 13- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
13 standard property; supported values are: 14 standard property; supported values are:
14 * "mii" 15 * "mii"
@@ -32,9 +33,11 @@ The following properties are common to the Ethernet controllers:
32 * "2000base-x", 33 * "2000base-x",
33 * "2500base-x", 34 * "2500base-x",
34 * "rxaui" 35 * "rxaui"
35- phy-connection-type: the same as "phy-mode" property but described in ePAPR; 36- phy-connection-type: the same as "phy-mode" property but described in the
37 Devicetree Specification;
36- phy-handle: phandle, specifies a reference to a node representing a PHY 38- phy-handle: phandle, specifies a reference to a node representing a PHY
37 device; this property is described in ePAPR and so preferred; 39 device; this property is described in the Devicetree Specification and so
40 preferred;
38- phy: the same as "phy-handle" property, not recommended for new bindings. 41- phy: the same as "phy-handle" property, not recommended for new bindings.
39- phy-device: the same as "phy-handle" property, not recommended for new 42- phy-device: the same as "phy-handle" property, not recommended for new
40 bindings. 43 bindings.
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpus.txt b/Documentation/devicetree/bindings/powerpc/fsl/cpus.txt
index f8cd2397aa04..d63ab1dec16d 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/cpus.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/cpus.txt
@@ -3,10 +3,10 @@ Power Architecture CPU Binding
3Copyright 2013 Freescale Semiconductor Inc. 3Copyright 2013 Freescale Semiconductor Inc.
4 4
5Power Architecture CPUs in Freescale SOCs are represented in device trees as 5Power Architecture CPUs in Freescale SOCs are represented in device trees as
6per the definition in ePAPR. 6per the definition in the Devicetree Specification.
7 7
8In addition to the ePAPR definitions, the properties defined below may be 8In addition to the the Devicetree Specification definitions, the properties
9present on CPU nodes. 9defined below may be present on CPU nodes.
10 10
11PROPERTIES 11PROPERTIES
12 12
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt b/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
index dc9bb3182525..8a70696395a7 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
@@ -1,7 +1,7 @@
1Freescale L2 Cache Controller 1Freescale L2 Cache Controller
2 2
3L2 cache is present in Freescale's QorIQ and QorIQ Qonverge platforms. 3L2 cache is present in Freescale's QorIQ and QorIQ Qonverge platforms.
4The cache bindings explained below are ePAPR compliant 4The cache bindings explained below are Devicetree Specification compliant
5 5
6Required Properties: 6Required Properties:
7 7
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt b/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
index b9a8a2bcfae7..0496ada4bba4 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
@@ -124,8 +124,8 @@ Port-Write Unit:
124 A single IRQ that handles port-write conditions is 124 A single IRQ that handles port-write conditions is
125 specified by this property. (Typically shared with error). 125 specified by this property. (Typically shared with error).
126 126
127 Note: All other standard properties (see the ePAPR) are allowed 127 Note: All other standard properties (see the Devicetree Specification)
128 but are optional. 128 are allowed but are optional.
129 129
130Example: 130Example:
131 rmu: rmu@d3000 { 131 rmu: rmu@d3000 {
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/srio.txt b/Documentation/devicetree/bindings/powerpc/fsl/srio.txt
index 07abf0f2f440..86ee6ea73754 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/srio.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/srio.txt
@@ -72,7 +72,8 @@ the following properties:
72 represents the LIODN associated with maintenance transactions 72 represents the LIODN associated with maintenance transactions
73 for the port. 73 for the port.
74 74
75Note: All other standard properties (see ePAPR) are allowed but are optional. 75Note: All other standard properties (see the Devicetree Specification)
76are allowed but are optional.
76 77
77Example: 78Example:
78 79
diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt
index 280d283304bb..fb740445199f 100644
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
@@ -1413,7 +1413,7 @@ Optional property:
1413 from DMA operations originating from the bus. It provides a means of 1413 from DMA operations originating from the bus. It provides a means of
1414 defining a mapping or translation between the physical address space of 1414 defining a mapping or translation between the physical address space of
1415 the bus and the physical address space of the parent of the bus. 1415 the bus and the physical address space of the parent of the bus.
1416 (for more information see ePAPR specification) 1416 (for more information see the Devicetree Specification)
1417 1417
1418* DMA Bus child 1418* DMA Bus child
1419Optional property: 1419Optional property:
diff --git a/Documentation/devicetree/usage-model.txt b/Documentation/devicetree/usage-model.txt
index 2b6b3d3f0388..33a8aaac02a8 100644
--- a/Documentation/devicetree/usage-model.txt
+++ b/Documentation/devicetree/usage-model.txt
@@ -387,7 +387,7 @@ static void __init harmony_init_machine(void)
387 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 387 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
388} 388}
389 389
390"simple-bus" is defined in the ePAPR 1.0 specification as a property 390"simple-bus" is defined in the Devicetree Specification as a property
391meaning a simple memory mapped bus, so the of_platform_populate() code 391meaning a simple memory mapped bus, so the of_platform_populate() code
392could be written to just assume simple-bus compatible nodes will 392could be written to just assume simple-bus compatible nodes will
393always be traversed. However, we pass it in as an argument so that 393always be traversed. However, we pass it in as an argument so that
diff --git a/Documentation/xtensa/mmu.txt b/Documentation/xtensa/mmu.txt
index 222a2c6748e6..5de8715d5bec 100644
--- a/Documentation/xtensa/mmu.txt
+++ b/Documentation/xtensa/mmu.txt
@@ -41,9 +41,9 @@ The scheme below assumes that the kernel is loaded below 0x40000000.
41 00..1F -> 00 -> 00 -> 00 41 00..1F -> 00 -> 00 -> 00
42 42
43The default location of IO peripherals is above 0xf0000000. This may be changed 43The default location of IO peripherals is above 0xf0000000. This may be changed
44using a "ranges" property in a device tree simple-bus node. See ePAPR 1.1, ยง6.5 44using a "ranges" property in a device tree simple-bus node. See the Devicetree
45for details on the syntax and semantic of simple-bus nodes. The following 45Specification, section 4.5 for details on the syntax and semantics of
46limitations apply: 46simple-bus nodes. The following limitations apply:
47 47
481. Only top level simple-bus nodes are considered 481. Only top level simple-bus nodes are considered
49 49