Commit 9ae8578b authored by Frank Rowand's avatar Frank Rowand Committed by Rob Herring

of: Documentation: change overlay example to use current syntax

The overlay implementation details in the compiled (DTB) file are
now properly implemented by the dtc compiler and should no longer
be hard coded in the source file.
Signed-off-by: default avatarFrank Rowand <frank.rowand@sony.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 2407fcb8
...@@ -19,6 +19,7 @@ Lets take an example where we have a foo board with the following base tree: ...@@ -19,6 +19,7 @@ Lets take an example where we have a foo board with the following base tree:
---- foo.dts ----------------------------------------------------------------- ---- foo.dts -----------------------------------------------------------------
/* FOO platform */ /* FOO platform */
/dts-v1/;
/ { / {
compatible = "corp,foo"; compatible = "corp,foo";
...@@ -30,30 +31,25 @@ Lets take an example where we have a foo board with the following base tree: ...@@ -30,30 +31,25 @@ Lets take an example where we have a foo board with the following base tree:
ocp: ocp { ocp: ocp {
/* peripherals that are always instantiated */ /* peripherals that are always instantiated */
peripheral1 { ... }; peripheral1 { ... };
} };
}; };
---- foo.dts ----------------------------------------------------------------- ---- foo.dts -----------------------------------------------------------------
The overlay bar.dts, when loaded (and resolved as described in [1]) should The overlay bar.dts,
---- bar.dts ----------------------------------------------------------------- ---- bar.dts - overlay target location by label ------------------------------
/plugin/; /* allow undefined label references and record them */ /dts-v1/;
/ { /plugin/;
.... /* various properties for loader use; i.e. part id etc. */ &ocp {
fragment@0 {
target = <&ocp>;
__overlay__ {
/* bar peripheral */ /* bar peripheral */
bar { bar {
compatible = "corp,bar"; compatible = "corp,bar";
... /* various properties and child nodes */ ... /* various properties and child nodes */
}
}; };
}; };
};
---- bar.dts ----------------------------------------------------------------- ---- bar.dts -----------------------------------------------------------------
result in foo+bar.dts when loaded (and resolved as described in [1]) should result in foo+bar.dts
---- foo+bar.dts ------------------------------------------------------------- ---- foo+bar.dts -------------------------------------------------------------
/* FOO platform + bar peripheral */ /* FOO platform + bar peripheral */
...@@ -73,8 +69,8 @@ result in foo+bar.dts ...@@ -73,8 +69,8 @@ result in foo+bar.dts
bar { bar {
compatible = "corp,bar"; compatible = "corp,bar";
... /* various properties and child nodes */ ... /* various properties and child nodes */
} };
} };
}; };
---- foo+bar.dts ------------------------------------------------------------- ---- foo+bar.dts -------------------------------------------------------------
...@@ -82,6 +78,27 @@ As a result of the overlay, a new device node (bar) has been created ...@@ -82,6 +78,27 @@ As a result of the overlay, a new device node (bar) has been created
so a bar platform device will be registered and if a matching device driver so a bar platform device will be registered and if a matching device driver
is loaded the device will be created as expected. is loaded the device will be created as expected.
If the base DT was not compiled with the -@ option then the "&ocp" label
will not be available to resolve the overlay node(s) to the proper location
in the base DT. In this case, the target path can be provided. The target
location by label syntax is preferred because the overlay can be applied to
any base DT containing the label, no matter where the label occurs in the DT.
The above bar.dts example modified to use target path syntax is:
---- bar.dts - overlay target location by explicit path ----------------------
/dts-v1/;
/plugin/;
&{/ocp} {
/* bar peripheral */
bar {
compatible = "corp,bar";
... /* various properties and child nodes */
}
};
---- bar.dts -----------------------------------------------------------------
Overlay in-kernel API Overlay in-kernel API
-------------------------------- --------------------------------
...@@ -105,35 +122,3 @@ enum of_overlay_notify_action for details. ...@@ -105,35 +122,3 @@ enum of_overlay_notify_action for details.
Note that a notifier callback is not supposed to store pointers to a device Note that a notifier callback is not supposed to store pointers to a device
tree node or its content beyond OF_OVERLAY_POST_REMOVE corresponding to the tree node or its content beyond OF_OVERLAY_POST_REMOVE corresponding to the
respective node it received. respective node it received.
Overlay DTS Format
------------------
The DTS of an overlay should have the following format:
{
/* ignored properties by the overlay */
fragment@0 { /* first child node */
target=<phandle>; /* phandle target of the overlay */
or
target-path="/path"; /* target path of the overlay */
__overlay__ {
property-a; /* add property-a to the target */
node-a { /* add to an existing, or create a node-a */
...
};
};
}
fragment@1 { /* second child node */
...
};
/* more fragments follow */
}
Using the non-phandle based target method allows one to use a base DT which does
not contain a __symbols__ node, i.e. it was not compiled with the -@ option.
The __symbols__ node is only required for the target=<phandle> method, since it
contains the information required to map from a phandle to a tree location.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment