Skip to content

Commit 7d888a0

Browse files
robertpjdayrobherring
authored andcommitted
Aesthetic/grammar fixes to first part of devicetree-basics.rst
Various grammar/font/spacing tweaks to first part of devicetree-basics.rst, including: * rendering node names in monospaced font * italicizing some terms * proper capitalization of some terms Signed-off-by: Robert P. J. Day <[email protected]> Signed-off-by: Rob Herring <[email protected]>
1 parent 68986fe commit 7d888a0

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

source/devicetree-basics.rst

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ program’s memory and passes a pointer to the devicetree to the client.
1515
This chapter describes the logical structure of the devicetree and
1616
specifies a base set of properties for use in describing device nodes.
1717
Chapter :ref:`chapter-device-node-requirements` specifies certain device nodes
18-
required by a |spec| compliant
19-
devicetree. Chapter 6 describes the |spec| defined device bindings— the
20-
requirements for representing certain device types classes of devices.
18+
required by a |spec|-compliant
19+
devicetree. Chapter 6 describes the |spec|-defined device bindings—the
20+
requirements for representing certain device types or classes of devices.
2121
Chapter 8 describes the in-memory encoding of the devicetree.
2222

2323
A devicetree is a tree data structure with nodes that describe the
2424
devices in a system. Each node has property/value pairs that describe
2525
the characteristics of the device being represented. Each node has
2626
exactly one parent except for the root node, which has no parent.
2727

28-
An |spec|-compliant devicetree describes device information in a system
28+
A |spec|-compliant devicetree describes device information in a system
2929
that cannot necessarily be dynamically detected by a client program. For
3030
example, the architecture of PCI enables a client to probe and detect
3131
attached devices, and thus devicetree nodes describing PCI devices
@@ -38,8 +38,8 @@ probing.
3838
:numref:`example-simple-devicetree` shows an example representation of a
3939
simple devicetree that is nearly
4040
complete enough to boot a simple operating system, with the platform
41-
type, CPU, and memory described. Device nodes are shown with properties
42-
and values shown beside the node.
41+
type, CPU, memory and a single UART described. Device nodes are shown
42+
with properties and values inside each node.
4343

4444
.. _example-simple-devicetree:
4545
.. digraph:: tree
@@ -60,8 +60,8 @@ and values shown beside the node.
6060
#size-cells=\<0\>\l"]
6161

6262
"cpu@0" [ label="\N |
63-
reg=\<0\>\l
6463
device_type=\"cpu\"\l
64+
reg=\<0\>\l
6565
timebase-frequency=\<825000000\>\l
6666
clock-frequency=\<825000000\>\l"]
6767

@@ -165,10 +165,10 @@ identified by a forward slash (/).
165165

166166
In :numref:`example-nodenames`:
167167

168-
* The nodes with the name cpu are distinguished by their unit-address
168+
* The nodes with the name ``cpu`` are distinguished by their unit-address
169169
values of 0 and 1.
170-
* The nodes with the name Ethernet are distinguished by their
171-
unit-address values of FE002000 and FE003000.
170+
* The nodes with the name ``ethernet`` are distinguished by their
171+
unit-address values of ``fe002000`` and ``fe003000``.
172172

173173
Generic Names Recommendation
174174
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -435,7 +435,7 @@ properties are described in detail in this section. Device nodes defined
435435
by |spec| (see Chapter :ref:`chapter-device-node-requirements`) may specify
436436
additional requirements or constraints regarding the use of the standard
437437
properties. Chapter :ref:`chapter-device-bindings` describes the representation
438-
of specific devices may also specify additional requirements.
438+
of specific devices and may also specify additional requirements.
439439

440440
.. note:: All examples of devicetree nodes in this document use the
441441
:abbr:`DTS (Devicetree Source)` format for specifying nodes and properties.
@@ -467,10 +467,10 @@ Description:
467467

468468
Example:
469469

470-
``compatible = "fsl,mpc8641-uart", "ns16550";``
470+
``compatible = "fsl,ns16550", "ns16550";``
471471

472472
In this example, an operating system would first try to locate a device
473-
driver that supported fsl,mpc8641-uart. If a driver was not found, it
473+
driver that supported fsl,ns16550. If a driver was not found, it
474474
would then try to locate a driver that supported the more general
475475
ns16550 device type.
476476

@@ -560,7 +560,7 @@ Description:
560560
============== ==============================================================
561561
Value Description
562562
============== ==============================================================
563-
``"okay"`` Indicates the device is operational
563+
``"okay"`` Indicates the device is operational.
564564
-------------- --------------------------------------------------------------
565565
``"disabled"`` Indicates that the device is not presently operational, but it
566566
might become operational in the future (for example, something
@@ -575,7 +575,7 @@ Description:
575575
-------------- --------------------------------------------------------------
576576
``"fail-sss"`` Indicates that the device is not operational. A serious error
577577
was detected in the device and it is unlikely to become
578-
operational without repair. The sss portion of the value is
578+
operational without repair. The *sss* portion of the value is
579579
specific to the device and indicates the error condition
580580
detected.
581581
============== ==============================================================
@@ -600,7 +600,7 @@ Description:
600600
The *#address-cells* and *#size-cells* properties are not inherited from
601601
ancestors in the devicetree. They shall be explicitly defined.
602602

603-
An |spec|-compliant boot program shall supply *#address-cells* and
603+
A |spec|-compliant boot program shall supply *#address-cells* and
604604
*#size-cells* on all nodes that have children.
605605

606606
If missing, a client program should assume a default value of 2 for
@@ -625,13 +625,13 @@ Example:
625625
};
626626
};
627627

628-
In this example, the *#address-cells* and *#size-cells* properties of the soc node
628+
In this example, the *#address-cells* and *#size-cells* properties of the ``soc`` node
629629
are both set to 1. This setting specifies that one cell is required to
630630
represent an address and one cell is required to represent the size of
631631
nodes that are children of this node.
632632

633633
The serial device *reg* property necessarily follows this specification
634-
set in the parent (soc) node—the address is represented by a single cell
634+
set in the parent (``soc``) node—the address is represented by a single cell
635635
(0x4600), and the size is represented by a single cell (0x100).
636636

637637
reg
@@ -647,7 +647,7 @@ Description:
647647
within the address space defined by its parent bus. Most commonly this
648648
means the offsets and lengths of memory-mapped IO register blocks, but
649649
may have a different meaning on some bus types. Addresses in the address
650-
space defined by root node are cpu real addresses.
650+
space defined by the root node are CPU real addresses.
651651

652652
The value is a *<prop-encoded-array>*, composed of an arbitrary number
653653
of pairs of address and length, *<address length>*. The number of
@@ -738,7 +738,7 @@ Address Translation Example:
738738
reg = <0x4600 0x100>;
739739
clock-frequency = <0>;
740740
interrupts = <0xA 0x8>;
741-
interrupt-parent = < &ipic >;
741+
interrupt-parent = <&ipic>;
742742
};
743743
};
744744

@@ -800,7 +800,7 @@ Description:
800800
The *name* property is a string specifying the name of the node. This
801801
property is deprecated, and its use is not recommended. However, it
802802
might be used in older non-|spec|-compliant devicetrees. Operating
803-
system should determine a node’s name based on the *name* component of
803+
system should determine a node’s name based on the *node-name* component of
804804
the node name (see section :ref:`sect-node-names`).
805805

806806
device_type (deprecated)
@@ -814,8 +814,8 @@ Description:
814814

815815
The *device\_type* property was used in IEEE 1275 to describe the
816816
device’s FCode programming model. Because |spec| does not have FCode, new
817-
use of the property is deprecated, and it should be included only on cpu
818-
and memory nodes for compatibility with IEEE 1275–derived devicetrees.
817+
use of the property is deprecated, and it should be included only on ``cpu``
818+
and ``memory`` nodes for compatibility with IEEE 1275–derived devicetrees.
819819

820820
.. _sect-interrupts:
821821

0 commit comments

Comments
 (0)