Skip to content

Commit ba39f63

Browse files
nandojvedkalowsk
authored andcommitted
dts: atmel: sam0: Fix aliases and chosen nodes
Reorder and add missing aliases and chosen nodes. Signed-off-by: Gerson Fernando Budke <[email protected]> (cherry picked from commit 748bbd0)
1 parent 503d458 commit ba39f63

File tree

9 files changed

+82
-54
lines changed

9 files changed

+82
-54
lines changed

dts/arm/atmel/samc21.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/ {
1010
aliases {
11+
adc-1 = &adc1;
12+
1113
sercom-4 = &sercom4;
1214
sercom-5 = &sercom5;
1315
};

dts/arm/atmel/samc2x.dtsi

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@
1313

1414
/ {
1515
aliases {
16+
adc-0 = &adc0;
17+
18+
port-a = &porta;
19+
port-b = &portb;
20+
port-c = &portc;
21+
22+
sercom-0 = &sercom0;
23+
sercom-1 = &sercom1;
24+
sercom-2 = &sercom2;
25+
sercom-3 = &sercom3;
26+
27+
tcc-0 = &tcc0;
28+
tcc-1 = &tcc1;
29+
tcc-2 = &tcc2;
30+
1631
watchdog0 = &wdog;
1732
};
1833

@@ -44,21 +59,6 @@
4459
<0x0080A048 0x4>;
4560
};
4661

47-
aliases {
48-
port-a = &porta;
49-
port-b = &portb;
50-
port-c = &portc;
51-
52-
sercom-0 = &sercom0;
53-
sercom-1 = &sercom1;
54-
sercom-2 = &sercom2;
55-
sercom-3 = &sercom3;
56-
57-
tcc-0 = &tcc0;
58-
tcc-1 = &tcc1;
59-
tcc-2 = &tcc2;
60-
};
61-
6262
soc {
6363
nvmctrl: nvmctrl@41004000 {
6464
compatible = "atmel,sam0-nvmctrl";

dts/arm/atmel/samd21.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
/ {
1010
aliases {
1111
tc-6 = &tc6;
12+
13+
tcc-0 = &tcc0;
14+
tcc-1 = &tcc1;
15+
tcc-2 = &tcc2;
1216
};
1317

1418
soc {

dts/arm/atmel/samd2x.dtsi

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@
1313

1414
/ {
1515
aliases {
16+
adc-0 = &adc;
17+
18+
port-a = &porta;
19+
port-b = &portb;
20+
21+
sercom-0 = &sercom0;
22+
sercom-1 = &sercom1;
23+
sercom-2 = &sercom2;
24+
sercom-3 = &sercom3;
25+
sercom-4 = &sercom4;
26+
sercom-5 = &sercom5;
27+
28+
tc-4 = &tc4;
29+
1630
watchdog0 = &wdog;
1731
};
1832

@@ -44,21 +58,6 @@
4458
<0x0080A048 0x4>;
4559
};
4660

47-
aliases {
48-
port-a = &porta;
49-
port-b = &portb;
50-
adc-0 = &adc;
51-
52-
sercom-0 = &sercom0;
53-
sercom-1 = &sercom1;
54-
sercom-2 = &sercom2;
55-
sercom-3 = &sercom3;
56-
sercom-4 = &sercom4;
57-
sercom-5 = &sercom5;
58-
59-
tc-4 = &tc4;
60-
};
61-
6261
soc {
6362
nvmctrl: nvmctrl@41004000 {
6463
compatible = "atmel,sam0-nvmctrl";

dts/arm/atmel/samd5x.dtsi

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@
1111
#include <zephyr/dt-bindings/pwm/pwm.h>
1212

1313
/ {
14-
chosen {
15-
zephyr,flash-controller = &nvmctrl;
16-
};
17-
18-
cpus {
19-
#address-cells = <1>;
20-
#size-cells = <0>;
21-
22-
cpu0: cpu@0 {
23-
compatible = "arm,cortex-m4f";
24-
reg = <0>;
25-
26-
#address-cells = <1>;
27-
#size-cells = <1>;
28-
29-
device_type = "cpu";
30-
31-
mpu: mpu@e000ed90 {
32-
compatible = "arm,armv7m-mpu";
33-
reg = <0xe000ed90 0x40>;
34-
};
35-
};
36-
};
37-
3814
aliases {
3915
adc-0 = &adc0;
4016
adc-1 = &adc1;
@@ -69,6 +45,27 @@
6945

7046
chosen {
7147
zephyr,entropy = &trng;
48+
zephyr,flash-controller = &nvmctrl;
49+
};
50+
51+
cpus {
52+
#address-cells = <1>;
53+
#size-cells = <0>;
54+
55+
cpu0: cpu@0 {
56+
compatible = "arm,cortex-m4f";
57+
reg = <0>;
58+
59+
#address-cells = <1>;
60+
#size-cells = <1>;
61+
62+
device_type = "cpu";
63+
64+
mpu: mpu@e000ed90 {
65+
compatible = "arm,armv7m-mpu";
66+
reg = <0xe000ed90 0x40>;
67+
};
68+
};
7269
};
7370

7471
soc {

dts/arm/atmel/saml21.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
#include <atmel/saml2x.dtsi>
88

99
/ {
10+
aliases {
11+
tcc-0 = &tcc0;
12+
tcc-1 = &tcc1;
13+
tcc-2 = &tcc2;
14+
};
15+
1016
soc {
1117
usb0: usb@41000000 {
1218
compatible = "atmel,sam0-usb";

dts/arm/atmel/saml2x.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@
1313

1414
/ {
1515
aliases {
16+
adc-0 = &adc;
17+
18+
port-a = &porta;
19+
port-b = &portb;
20+
21+
sercom-0 = &sercom0;
22+
sercom-1 = &sercom1;
23+
sercom-2 = &sercom2;
24+
sercom-3 = &sercom3;
25+
sercom-4 = &sercom4;
26+
sercom-5 = &sercom5;
27+
28+
tc-4 = &tc4;
29+
1630
watchdog0 = &wdog;
1731
};
1832

dts/arm/atmel/samr21.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
/ {
1010
aliases {
1111
port-c = &portc;
12+
13+
tcc-0 = &tcc0;
14+
tcc-1 = &tcc1;
15+
tcc-2 = &tcc2;
1216
};
1317

1418
soc {

dts/arm/atmel/samr34.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
/ {
1515
aliases {
16+
port-c = &portc;
17+
1618
lora0 = &lora;
1719
};
1820

0 commit comments

Comments
 (0)