[bootlin/training-materials updates] master: Kernel slides: update BBB device tree slides (31ff51e4)
Michael Opdenacker
michael.opdenacker at bootlin.com
Mon Apr 19 07:33:58 CEST 2021
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/31ff51e4aaabff946f7a82be4b8d4c3e334301d2
>---------------------------------------------------------------
commit 31ff51e4aaabff946f7a82be4b8d4c3e334301d2
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date: Mon Apr 19 07:33:58 2021 +0200
Kernel slides: update BBB device tree slides
- Actually the uart0 definition is now in another included dtsi file
- Update the toplevel too
- Also add detail about of_match_ptr()
Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>
>---------------------------------------------------------------
31ff51e4aaabff946f7a82be4b8d4c3e334301d2
slides/kernel-device-model/dt-inheritance.dia | 303 ++++++++++-----------
slides/kernel-device-model/kernel-device-model.tex | 3 +
2 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/slides/kernel-device-model/dt-inheritance.dia b/slides/kernel-device-model/dt-inheritance.dia
index c95d0cc6..6db5c3b2 100644
--- a/slides/kernel-device-model/dt-inheritance.dia
+++ b/slides/kernel-device-model/dt-inheritance.dia
@@ -119,7 +119,7 @@
<dia:point val="16.05,21.05"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16,21;40.55,33.8"/>
+ <dia:rectangle val="16,21;40.55,34.5"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="16.05,21.05"/>
@@ -128,7 +128,7 @@
<dia:real val="24.449999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="12.699999999999999"/>
+ <dia:real val="13.399999999999995"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -148,7 +148,7 @@
<dia:point val="26.0443,5.88"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="26.0443,5.345;36.9243,9.995"/>
+ <dia:rectangle val="26.0443,5.34624;36.9243,9.99264"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -186,7 +186,7 @@
<dia:point val="16.7672,21.9364"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.7672,21.4014;39.8072,33.2514"/>
+ <dia:rectangle val="16.7672,21.3865;39.8234,34.0814"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -196,9 +196,10 @@
model = "TI AM335x BeagleBone Black";
[...]
ocp {
+ [...]
uart0: serial at 44e09000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
- reg = <0x44e09000 0x2000>;
+ reg = <0x0 0x1000>;
interrupts = <72>;
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>;
@@ -233,7 +234,7 @@
<dia:point val="21.15,12"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.15,7.1125;24.4425,13.31"/>
+ <dia:rectangle val="21.15,7.11474;24.4425,13.3081"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -266,7 +267,7 @@
<dia:point val="8.6,28.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="8.6,23.8125;11.8925,30.01"/>
+ <dia:rectangle val="8.6,23.8147;11.8925,30.0081"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -299,7 +300,7 @@
<dia:point val="29.9824,16.205"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.9824,15.67;37.3424,16.32"/>
+ <dia:rectangle val="29.9824,15.6712;37.3424,16.3176"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -332,7 +333,7 @@
<dia:point val="26.9095,18.013"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="26.9095,16.873;36.5745,19.5552"/>
+ <dia:rectangle val="26.9095,16.8731;36.572,19.5529"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -366,7 +367,7 @@ BeagleBone boards#</dia:string>
<dia:point val="8.9962,33.6914"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="8.9962,32.5514;15.2087,33.9989"/>
+ <dia:rectangle val="8.9962,32.5515;15.2087,33.9966"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -399,7 +400,7 @@ BeagleBone boards#</dia:string>
<dia:point val="33.4636,33.2014"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.4636,32.6664;39.8636,33.3164"/>
+ <dia:rectangle val="33.4636,32.6676;39.8636,33.314"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -432,7 +433,7 @@ BeagleBone boards#</dia:string>
<dia:point val="41.4447,25.1812"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="41.4447,24.0412;57.9597,27.9581"/>
+ <dia:rectangle val="41.4447,24.0413;57.9572,27.9559"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -496,13 +497,15 @@ DTB contents;#</dia:string>
<dia:point val="43.1443,5.89902"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="43.1443,5.36402;57.5443,13.214"/>
+ <dia:rectangle val="43.1281,5.3491;57.5443,14.844"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>##include "am33xx.dtsi"
#include "am335x-bone-common.dtsi"
+#include "am335x-boneblack-common.dtsi"
+
/ {
model = "TI AM335x BeagleBone Black";
compatible = "ti,am335x-bone-black",
@@ -538,7 +541,7 @@ DTB contents;#</dia:string>
<dia:point val="38.25,12.019"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.25,7.1315;41.5425,13.329"/>
+ <dia:rectangle val="38.25,7.13374;41.5425,13.3271"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -571,7 +574,7 @@ DTB contents;#</dia:string>
<dia:point val="51.0824,16.224"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="51.0824,15.689;57.4824,16.339"/>
+ <dia:rectangle val="51.0824,15.6902;57.4824,16.3366"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -604,7 +607,7 @@ DTB contents;#</dia:string>
<dia:point val="43.706,17.9578"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="43.706,16.8178;56.9585,18.2653"/>
+ <dia:rectangle val="43.706,16.8179;56.956,18.263"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -637,7 +640,7 @@ DTB contents;#</dia:string>
<dia:point val="39.15,25.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.15,24.505;39.15,25.2525"/>
+ <dia:rectangle val="39.15,24.5059;39.15,25.2509"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -665,152 +668,146 @@ DTB contents;#</dia:string>
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
- <dia:group>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="matrix"/>
- <dia:object type="Standard - Box" version="0" id="O17">
- <dia:attribute name="obj_pos">
- <dia:point val="0.05,5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="-7.45058e-10,4.95;20.55,16.75"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="0.05,5"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="20.449999999999999"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="11.699999999999999"/>
- </dia:attribute>
- <dia:attribute name="border_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="border_color">
- <dia:color val="#868686ff"/>
- </dia:attribute>
- <dia:attribute name="inner_color">
- <dia:color val="#e5e5e5ff"/>
- </dia:attribute>
- <dia:attribute name="show_background">
- <dia:boolean val="true"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O18">
- <dia:attribute name="obj_pos">
- <dia:point val="0.51716,5.88284"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="0.51716,5.34784;20.0372,16.3978"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#/ {
+ <dia:object type="Standard - Box" version="0" id="O17">
+ <dia:attribute name="obj_pos">
+ <dia:point val="-0.45,5"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="-0.5,4.95;20.05,16.75"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="-0.45,5"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="20.449999999999999"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="11.699999999999999"/>
+ </dia:attribute>
+ <dia:attribute name="border_width">
+ <dia:real val="0.10000000149011612"/>
+ </dia:attribute>
+ <dia:attribute name="border_color">
+ <dia:color val="#868686ff"/>
+ </dia:attribute>
+ <dia:attribute name="inner_color">
+ <dia:color val="#e5e5e5ff"/>
+ </dia:attribute>
+ <dia:attribute name="show_background">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="1" id="O18">
+ <dia:attribute name="obj_pos">
+ <dia:point val="0.01716,5.88284"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="0.01716,5.34908;19.5372,16.3955"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#/ {
compatible = "ti,am33xx";
[...]
ocp {
- [...]
+ [...]
uart0: serial at 44e09000 {
compatible = "ti,am3352-uart", "ti,omap3-uart";
- reg = <0x44e09000 0x2000>;
+ reg = <0x0 0x1000>;
interrupts = <72>;
status = "disabled";
[...]
};
};
};#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="Inconsolata" style="48" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="0.51716,5.88284"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000ff"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="valign">
- <dia:enum val="3"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O19">
- <dia:attribute name="obj_pos">
- <dia:point val="16.41,16.1343"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="16.41,15.5993;19.93,16.2493"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#am33xx.dtsi#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="Inconsolata" style="48" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="16.41,16.1343"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000ff"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="valign">
- <dia:enum val="3"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O20">
- <dia:attribute name="obj_pos">
- <dia:point val="3.91636,17.9242"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="3.91636,16.7842;16.4614,18.2317"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#Definition of the AM33xx SoC#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="1.2347221747040749"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="3.91636,17.9242"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000ff"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="valign">
- <dia:enum val="3"/>
- </dia:attribute>
- </dia:object>
- </dia:group>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="Inconsolata" style="48" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="0.01716,5.88284"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="1" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="6.86,16.1343"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="6.86,15.6005;19.66,16.2469"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#am33xx-l4.dtsi (included by am33xx.dtsi)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="Inconsolata" style="48" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="6.86,16.1343"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="1" id="O20">
+ <dia:attribute name="obj_pos">
+ <dia:point val="3.41636,17.9242"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="3.41636,16.7843;15.9614,18.2294"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#Definition of the AM33xx SoC#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="1.2347221747040749"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="3.41636,17.9242"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000ff"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
+ </dia:object>
</dia:layer>
</dia:diagram>
diff --git a/slides/kernel-device-model/kernel-device-model.tex b/slides/kernel-device-model/kernel-device-model.tex
index 74e5e4b5..56879748 100644
--- a/slides/kernel-device-model/kernel-device-model.tex
+++ b/slides/kernel-device-model/kernel-device-model.tex
@@ -689,6 +689,7 @@ uart0: serial at 44e09000 {
\begin{frame}[fragile]
\frametitle{Device Tree: {\tt compatible} string}
+ \small
\begin{itemize}
\item With the {\em device tree}, a {\em device} is bound to the
corresponding {\em driver} using the {\bf compatible} string.
@@ -717,6 +718,8 @@ static struct platform_driver serial_omap_driver = {
};
\end{minted}
\end{block}
+ \item Note: the \kfunc{of_match_ptr} macro instantiates to \code{NULL}
+ when \kconfig{CONFIG_OF} is not set.
\end{itemize}
\end{frame}
More information about the training-materials-updates
mailing list