Skip to content

Commit

Permalink
Kernel slides: update Allwinner A20 pinctrl diagram
Browse files Browse the repository at this point in the history
The shown .dtsi had different properties compared to the .dts

Reported-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
  • Loading branch information
michaelopdenacker authored and tpetazzoni committed Oct 29, 2021
1 parent ae2a3ef commit b262382
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions slides/kernel-pinmuxing/allwinner-example.dia
Expand Up @@ -70,10 +70,10 @@
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="snap-to-grid">
<dia:boolean val="true"/>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="snap-to-object">
<dia:boolean val="true"/>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="show-grid">
<dia:boolean val="true"/>
Expand Down Expand Up @@ -148,23 +148,23 @@
<dia:point val="-4.09231,-0.825614"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-4.09231,-1.53173;16.6102,17.3151"/>
<dia:rectangle val="-4.09231,-1.55311;16.6316,17.3578"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#/ {
soc@01c00000 {
pio: pinctrl@01c20800 {
...
soc {
...
pio: pinctrl@01c20800 {
compatible = "allwinner,sun7i-a20-pinctrl";
reg = &lt;0x01c20800 0x400&gt;;
interrupts = &lt;0 28 1&gt;;
...

uart0_pins_a: uart0@0 {
allwinner,pins = "PB22", "PB23";
allwinner,function = "uart0";
allwinner,drive = &lt;0&gt;;
allwinner,pull = &lt;0&gt;;
uart0_pb_pins: uart0-pb-pins {
pins = "PB22", "PB23";
function = "uart0";
};
...
};
Expand Down Expand Up @@ -198,7 +198,7 @@
<dia:point val="35.2132,-1.1748"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="35.2132,-1.88092;62.2532,33.8992"/>
<dia:rectangle val="35.2132,-1.9023;62.2746,33.942"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
Expand All @@ -210,7 +210,7 @@
pinctrl-names = "default";
pinctrl-0 = &lt;&amp;led_pins_olinuxino&gt;;

green {
led {
label = "a20-olinuxino-micro:green:usr";
gpios = &lt;&amp;pio 7 2 GPIO_ACTIVE_HIGH&gt;;
default-state = "on";
Expand All @@ -234,7 +234,7 @@

&amp;uart0 {
pinctrl-names = "default";
pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;
pinctrl-0 = &lt;&amp;uart0_pb_pins&gt;;
status = "okay";
};#</dia:string>
</dia:attribute>
Expand Down Expand Up @@ -301,16 +301,16 @@
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O5">
<dia:attribute name="obj_pos">
<dia:point val="37.9,31.4493"/>
<dia:point val="38.1,31.55"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="11.85,5.41459;38.05,31.5993"/>
<dia:rectangle val="11.95,7.96529;38.25,31.7"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="37.9,31.4493"/>
<dia:point val="24,31.4493"/>
<dia:point val="24,6"/>
<dia:point val="12,6"/>
<dia:point val="38.1,31.55"/>
<dia:point val="24.1,31.55"/>
<dia:point val="24.1,8.5507"/>
<dia:point val="12.1,8.5507"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
Expand Down Expand Up @@ -338,14 +338,14 @@
</dia:object>
<dia:object type="Standard - Line" version="0" id="O6">
<dia:attribute name="obj_pos">
<dia:point val="-2.28694,5.89315"/>
<dia:point val="-2.3,7.65"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-2.43694,5.74315;-2.13694,12.227"/>
<dia:rectangle val="-2.50168,7.49832;-2.14832,12.2517"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
<dia:point val="-2.28694,5.89315"/>
<dia:point val="-2.28694,12.077"/>
<dia:point val="-2.3,7.65"/>
<dia:point val="-2.35,12.1"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
Expand All @@ -359,10 +359,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O7">
<dia:attribute name="obj_pos">
<dia:point val="-3.16576,8.17971"/>
<dia:point val="-3.16576,8.87971"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-6.21826,7.13752;-3.16576,10.7165"/>
<dia:rectangle val="-6.21826,7.83752;-3.16576,11.4165"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
Expand All @@ -378,7 +378,7 @@ config#</dia:string>
<dia:real val="1.1288888454437256"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="-3.16576,8.17971"/>
<dia:point val="-3.16576,8.87971"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
Expand Down Expand Up @@ -698,16 +698,16 @@ config#</dia:string>
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O18">
<dia:attribute name="obj_pos">
<dia:point val="34.4801,16.5493"/>
<dia:point val="34.2,16.625"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="17.7801,0.26392;34.6301,16.6993"/>
<dia:rectangle val="17.4801,2.46392;34.35,16.775"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="34.4801,16.5493"/>
<dia:point val="27,16.5493"/>
<dia:point val="27,0.84933"/>
<dia:point val="17.9301,0.84933"/>
<dia:point val="34.2,16.625"/>
<dia:point val="26.7,16.625"/>
<dia:point val="26.7,3.04933"/>
<dia:point val="17.6301,3.04933"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
Expand Down

0 comments on commit b262382

Please sign in to comment.