Skip to content

Commit dcda85f

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into video-sw-generator
2 parents ef080c2 + 209bfbd commit dcda85f

File tree

10 files changed

+9
-6
lines changed

10 files changed

+9
-6
lines changed

dts/arm/renesas/ra/ra4/r7fa4e10x.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@
306306
port-irq5-pins = <1 10>;
307307
port-irq6-pins = <9>;
308308
port-irq7-pins = <8>;
309+
vbatts-pins = <2>;
309310
};
310311

311312
&dac_global {

dts/arm/renesas/ra/ra4/r7fa4e2b93cfm.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@
370370
port-irq6-pins = <9>;
371371
port-irq7-pins = <8>;
372372
port-irq14-pins = <3>;
373+
/delete-property/ vbatts-pins;
373374
};
374375

375376
&ioport8 {

dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
port-irq4-pins = <2>;
224224
port-irq6-pins = <9>;
225225
port-irq9-pins = <14>;
226+
vbatts-pins = <2>;
226227
};
227228

228229
&ioport5 {

dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
gpio-controller;
103103
#gpio-cells = <2>;
104104
ngpios = <16>;
105+
vbatts-pins = <2 3 4>;
105106
status = "disabled";
106107
};
107108

dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
gpio-controller;
9999
#gpio-cells = <2>;
100100
ngpios = <16>;
101+
vbatts-pins = <2 3 4>;
101102
status = "disabled";
102103
};
103104

dts/arm/renesas/ra/ra6/r7fa6e2bx.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@
366366
port-irq6-pins = <9>;
367367
port-irq7-pins = <8>;
368368
port-irq14-pins = <3>;
369+
/delete-property/ vbatts-pins;
369370
};
370371

371372
&ioport8 {

dts/arm/renesas/ra/ra6/ra6-cm33-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
gpio-controller;
9595
#gpio-cells = <2>;
9696
ngpios = <16>;
97+
vbatts-pins = <2 3 4>;
9798
status = "disabled";
9899
};
99100

dts/arm/renesas/ra/ra6/ra6-cm4-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
gpio-controller;
9494
#gpio-cells = <2>;
9595
ngpios = <16>;
96+
vbatts-pins = <2 3 4>;
9697
status = "disabled";
9798
};
9899

subsys/net/lib/shell/dns.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void dns_result_cb(enum dns_resolve_status status,
6565
info->ai_srv.priority,
6666
info->ai_srv.weight,
6767
info->ai_srv.port,
68-
info->ai_srv.targetlen,
68+
(int)info->ai_srv.targetlen,
6969
info->ai_srv.target);
7070
break;
7171
}

tests/application_development/ram_context_for_isr/testcase.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ tests:
66
application_development.ram_context_for_isr:
77
# Exclude mps3/corstone310 because it uses another mechanism to support relocation
88
# of the vector table (CONFIG_ROMSTART_RELOCATION_ROM).
9-
# (Temporarily) Exclude STM32C0 platforms as last IRQ in vector is always used.
109
platform_exclude:
1110
- mps3/corstone310/an555
1211
- mps3/corstone310/fvp
@@ -20,7 +19,3 @@ tests:
2019
- hexiwear/mkw40z4
2120
- frdm_kw41z/mkw41z4
2221
- frdm_kl25z/mkl25z4
23-
- stm32c0116_dk/stm32c011xx
24-
- nucleo_c031c6/stm32c031xx
25-
- nucleo_c071rb/stm32c071xx
26-
- nucleo_c092rc/stm32c092xx

0 commit comments

Comments
 (0)