Skip to content

Commit 5339f9d

Browse files
committed
Merge tag 'devicetree-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring: - Rework and export the changeset API to make it available to users other than DT overlays - ARM secure devices binding - OCTEON USB binding - Clean-up of various SRAM binding docs - Various other binding doc updates * tag 'devicetree-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (21 commits) drivers/of: Export OF changeset functions Fix documentation for adp1653 DT ARM: psci: Fix indentation in DT bindings of/platform: export of_default_bus_match_table of/unittest: Show broken behaviour in the platform bus of: fix declaration of of_io_request_and_map of/address: replace printk(KERN_ERR ...) with pr_err(...) of/irq: optimize device node matching loop in of_irq_init() dt-bindings: tda998x: Document the required 'port' node. net/macb: bindings doc: Merge cdns-emac to macb dt-bindings: Misc fix for the ATH79 DDR controllers dt-bindings: Misc fix for the ATH79 MISC interrupt controllers Documentation: dt: Add bindings for Secure-only devices dt-bindings: ARM: add arm,cortex-a72 compatible string ASoC: Atmel: ClassD: add GCK's parent clock in DT binding DT: add Olimex to vendor prefixes Documentation: fsl-quadspi: Add fsl,ls1021-qspi compatible string Documentation/devicetree: document OCTEON USB bindings usb: misc: usb3503: Describe better how to bind clock to the hub dt-bindings: Consolidate SRAM bindings from all vendors ...
2 parents cf8d7e3 + 1832237 commit 5339f9d

File tree

28 files changed

+252
-98
lines changed

28 files changed

+252
-98
lines changed

Documentation/devicetree/bindings/arm/arm,scpi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Required properties:
6363
- compatible : should be "arm,juno-sram-ns" for Non-secure SRAM on Juno
6464

6565
The rest of the properties should follow the generic mmio-sram description
66-
found in ../../misc/sysram.txt
66+
found in ../../sram/sram.txt
6767

6868
Each sub-node represents the reserved area for SCPI.
6969

Documentation/devicetree/bindings/arm/cpus.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ nodes to be present and contain the properties described below.
157157
"arm,cortex-a17"
158158
"arm,cortex-a53"
159159
"arm,cortex-a57"
160+
"arm,cortex-a72"
160161
"arm,cortex-m0"
161162
"arm,cortex-m0+"
162163
"arm,cortex-m1"

Documentation/devicetree/bindings/arm/psci.txt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@ Main node required properties:
2323

2424
- compatible : should contain at least one of:
2525

26-
* "arm,psci" : for implementations complying to PSCI versions prior to
27-
0.2. For these cases function IDs must be provided.
28-
29-
* "arm,psci-0.2" : for implementations complying to PSCI 0.2. Function
30-
IDs are not required and should be ignored by an OS with PSCI 0.2
31-
support, but are permitted to be present for compatibility with
32-
existing software when "arm,psci" is later in the compatible list.
33-
34-
* "arm,psci-1.0" : for implementations complying to PSCI 1.0. PSCI 1.0 is
35-
backward compatible with PSCI 0.2 with minor specification updates,
36-
as defined in the PSCI specification[2].
26+
* "arm,psci" : For implementations complying to PSCI versions prior
27+
to 0.2.
28+
For these cases function IDs must be provided.
29+
30+
* "arm,psci-0.2" : For implementations complying to PSCI 0.2.
31+
Function IDs are not required and should be ignored by
32+
an OS with PSCI 0.2 support, but are permitted to be
33+
present for compatibility with existing software when
34+
"arm,psci" is later in the compatible list.
35+
36+
* "arm,psci-1.0" : For implementations complying to PSCI 1.0.
37+
PSCI 1.0 is backward compatible with PSCI 0.2 with
38+
minor specification updates, as defined in the PSCI
39+
specification[2].
3740

3841
- method : The method of calling the PSCI firmware. Permitted
3942
values are:
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
* ARM Secure world bindings
2+
3+
ARM CPUs with TrustZone support have two distinct address spaces,
4+
"Normal" and "Secure". Most devicetree consumers (including the Linux
5+
kernel) are not TrustZone aware and run entirely in either the Normal
6+
world or the Secure world. However some devicetree consumers are
7+
TrustZone aware and need to be able to determine whether devices are
8+
visible only in the Secure address space, only in the Normal address
9+
space, or visible in both. (One example of that situation would be a
10+
virtual machine which boots Secure firmware and wants to tell the
11+
firmware about the layout of the machine via devicetree.)
12+
13+
The general principle of the naming scheme for Secure world bindings
14+
is that any property that needs a different value in the Secure world
15+
can be supported by prefixing the property name with "secure-". So for
16+
instance "secure-foo" would override "foo". For property names with
17+
a vendor prefix, the Secure variant of "vendor,foo" would be
18+
"vendor,secure-foo". If there is no "secure-" property then the Secure
19+
world value is the same as specified for the Normal world by the
20+
non-prefixed property. However, only the properties listed below may
21+
validly have "secure-" versions; this list will be enlarged on a
22+
case-by-case basis.
23+
24+
Defining the bindings in this way means that a device tree which has
25+
been annotated to indicate the presence of Secure-only devices can
26+
still be processed unmodified by existing Non-secure software (and in
27+
particular by the kernel).
28+
29+
Note that it is still valid for bindings intended for purely Secure
30+
world consumers (like kernels that run entirely in Secure) to simply
31+
describe the view of Secure world using the standard bindings. These
32+
secure- bindings only need to be used where both the Secure and Normal
33+
world views need to be described in a single device tree.
34+
35+
Valid Secure world properties:
36+
37+
- secure-status : specifies whether the device is present and usable
38+
in the secure world. The combination of this with "status" allows
39+
the various possible combinations of device visibility to be
40+
specified. If "secure-status" is not specified it defaults to the
41+
same value as "status"; if "status" is not specified either then
42+
both default to "okay". This means the following combinations are
43+
possible:
44+
45+
/* Neither specified: default to visible in both S and NS */
46+
secure-status = "okay"; /* visible in both */
47+
status = "okay"; /* visible in both */
48+
status = "okay"; secure-status = "okay"; /* visible in both */
49+
secure-status = "disabled"; /* NS-only */
50+
status = "okay"; secure-status = "disabled"; /* NS-only */
51+
status = "disabled"; secure-status = "okay"; /* S-only */
52+
status = "disabled"; /* disabled in both */
53+
status = "disabled"; secure-status = "disabled"; /* disabled in both */

Documentation/devicetree/bindings/display/bridge/tda998x.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Required properties;
55

66
- reg: I2C address
77

8+
Required node:
9+
- port: Input port node with endpoint definition, as described
10+
in Documentation/devicetree/bindings/graph.txt
11+
812
Optional properties:
913
- interrupts: interrupt number and trigger type
1014
default: polling

Documentation/devicetree/bindings/interrupt-controller/qca,ath79-misc-intc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Interrupt Controllers bindings used by client devices.
2222
Example:
2323

2424
interrupt-controller@18060010 {
25-
compatible = "qca,ar9132-misc-intc", qca,ar7100-misc-intc";
25+
compatible = "qca,ar9132-misc-intc", "qca,ar7100-misc-intc";
2626
reg = <0x18060010 0x4>;
2727

2828
interrupt-parent = <&cpuintc>;

Documentation/devicetree/bindings/media/i2c/adp1653.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ There are two LED outputs available - flash and indicator. One LED is
1212
represented by one child node, nodes need to be named "flash" and "indicator".
1313

1414
Required properties of the LED child node:
15-
- max-microamp : see Documentation/devicetree/bindings/leds/common.txt
15+
- led-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
1616

1717
Required properties of the flash LED child node:
1818

1919
- flash-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
2020
- flash-timeout-us : see Documentation/devicetree/bindings/leds/common.txt
21+
- led-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
2122

2223
Example:
2324

@@ -29,9 +30,9 @@ Example:
2930
flash {
3031
flash-timeout-us = <500000>;
3132
flash-max-microamp = <320000>;
32-
max-microamp = <50000>;
33+
led-max-microamp = <50000>;
3334
};
3435
indicator {
35-
max-microamp = <17500>;
36+
led-max-microamp = <17500>;
3637
};
3738
};

Documentation/devicetree/bindings/memory-controllers/ath79-ddr-controller.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Binding for Qualcomm Atheros AR7xxx/AR9xxx DDR controller
22

3-
The DDR controller of the ARxxx and AR9xxx families provides an interface
3+
The DDR controller of the AR7xxx and AR9xxx families provides an interface
44
to flush the FIFO between various devices and the DDR. This is mainly used
55
by the IRQ controller to flush the FIFO before running the interrupt handler
66
of such devices.
@@ -11,9 +11,9 @@ Required properties:
1111
"qca,[ar7100|ar7240]-ddr-controller" as fallback.
1212
On SoC with PCI support "qca,ar7100-ddr-controller" should be used as
1313
fallback, otherwise "qca,ar7240-ddr-controller" should be used.
14-
- reg: Base address and size of the controllers memory area
15-
- #qca,ddr-wb-channel-cells: has to be 1, the index of the write buffer
16-
channel
14+
- reg: Base address and size of the controller's memory area
15+
- #qca,ddr-wb-channel-cells: Specifies the number of cells needed to encode
16+
the write buffer channel index, should be 1.
1717

1818
Example:
1919

Documentation/devicetree/bindings/mtd/fsl-quadspi.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Required properties:
44
- compatible : Should be "fsl,vf610-qspi", "fsl,imx6sx-qspi",
5-
"fsl,imx7d-qspi", "fsl,imx6ul-qspi"
5+
"fsl,imx7d-qspi", "fsl,imx6ul-qspi",
6+
"fsl,ls1021-qspi"
67
- reg : the first contains the register location and length,
78
the second contains the memory mapping address and length
89
- reg-names: Should contain the reg names "QuadSPI" and "QuadSPI-memory"

Documentation/devicetree/bindings/net/cdns-emac.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)