Skip to content

Commit 06daf0e

Browse files
jeremydickkartben
jeremydick
authored and
kartben
committed
dts: arm: renesas: ra: Remove unneeded container nodes for OFS registers
The OFS container node is not necessary, just put all the child nodes in the soc node Signed-off-by: Jeremy Dick <[email protected]>
1 parent d380d43 commit 06daf0e

17 files changed

+596
-752
lines changed

‎dts/arm/renesas/ra/ra2/ra2l1.dtsi‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -524,42 +524,29 @@
524524
status = "disabled";
525525
};
526526

527-
option-setting-ofs-in-rom@400 {
528-
reg = <0x00000400 0x3c>;
529-
#address-cells = <1>;
530-
#size-cells = <1>;
531-
532-
option_setting_ofs0: option-setting-ofs0@400 {
533-
compatible = "renesas,ofs-memory";
534-
reg = <0x00000400 0x4>;
535-
status = "okay";
536-
};
537-
538-
option_setting_ofs1: option-setting-ofs1@404 {
539-
compatible = "renesas,ofs-memory";
540-
reg = <0x00000404 0x4>;
541-
status = "okay";
542-
};
527+
option_setting_ofs0: option-setting-ofs0@400 {
528+
compatible = "renesas,ofs-memory";
529+
reg = <0x00000400 0x4>;
530+
status = "okay";
531+
};
543532

544-
option_setting_secmpu: option-setting-secmpu@408 {
545-
compatible = "renesas,ofs-memory";
546-
reg = <0x00000408 0x34>;
547-
status = "okay";
548-
};
533+
option_setting_ofs1: option-setting-ofs1@404 {
534+
compatible = "renesas,ofs-memory";
535+
reg = <0x00000404 0x4>;
536+
status = "okay";
549537
};
550538

551-
option-setting-ofs-conf@1010010 {
552-
reg = <0x01010010 0x24>;
553-
#address-cells = <1>;
554-
#size-cells = <1>;
539+
option_setting_secmpu: option-setting-secmpu@408 {
540+
compatible = "renesas,ofs-memory";
541+
reg = <0x00000408 0x34>;
555542
status = "okay";
543+
};
556544

557-
option_setting_osis: option-setting-osis@1010018 {
558-
compatible = "zephyr,memory-region";
559-
zephyr,memory-region = "OFS_OSIS_MEMORY";
560-
reg = <0x01010018 0x1c>;
561-
status = "okay";
562-
};
545+
option_setting_osis: option-setting-osis@1010018 {
546+
compatible = "zephyr,memory-region";
547+
zephyr,memory-region = "OFS_OSIS_MEMORY";
548+
reg = <0x01010018 0x1c>;
549+
status = "okay";
563550
};
564551
};
565552

‎dts/arm/renesas/ra/ra2/ra2xx.dtsi‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -393,42 +393,29 @@
393393
};
394394
};
395395

396-
option-setting-ofs-in-rom@400 {
397-
reg = <0x00000400 0x3c>;
398-
#address-cells = <1>;
399-
#size-cells = <1>;
400-
401-
option_setting_ofs0: option-setting-ofs0@400 {
402-
compatible = "renesas,ofs-memory";
403-
reg = <0x00000400 0x4>;
404-
status = "okay";
405-
};
406-
407-
option_setting_ofs1: option-setting-ofs1@404 {
408-
compatible = "renesas,ofs-memory";
409-
reg = <0x00000404 0x4>;
410-
status = "okay";
411-
};
396+
option_setting_ofs0: option-setting-ofs0@400 {
397+
compatible = "renesas,ofs-memory";
398+
reg = <0x00000400 0x4>;
399+
status = "okay";
400+
};
412401

413-
option_setting_secmpu: option-setting-secmpu@408 {
414-
compatible = "renesas,ofs-memory";
415-
reg = <0x00000408 0x34>;
416-
status = "okay";
417-
};
402+
option_setting_ofs1: option-setting-ofs1@404 {
403+
compatible = "renesas,ofs-memory";
404+
reg = <0x00000404 0x4>;
405+
status = "okay";
418406
};
419407

420-
option-setting-ofs-conf@1010008 {
421-
reg = <0x01010008 0x2c>;
422-
#address-cells = <1>;
423-
#size-cells = <1>;
408+
option_setting_secmpu: option-setting-secmpu@408 {
409+
compatible = "renesas,ofs-memory";
410+
reg = <0x00000408 0x34>;
424411
status = "okay";
412+
};
425413

426-
option_setting_osis: option-setting-osis@1010018 {
427-
compatible = "zephyr,memory-region";
428-
zephyr,memory-region = "OFS_OSIS_MEMORY";
429-
reg = <0x01010018 0x1c>;
430-
status = "okay";
431-
};
414+
option_setting_osis: option-setting-osis@1010018 {
415+
compatible = "zephyr,memory-region";
416+
zephyr,memory-region = "OFS_OSIS_MEMORY";
417+
reg = <0x01010018 0x1c>;
418+
status = "okay";
432419
};
433420
};
434421
};

‎dts/arm/renesas/ra/ra4/r7fa4c1bx.dtsi‎

Lines changed: 52 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -535,74 +535,67 @@
535535
status = "disabled";
536536
};
537537

538-
option-setting-ofs-conf@100a100 {
539-
reg = <0x0100a100 0x200>;
540-
#address-cells = <1>;
541-
#size-cells = <1>;
538+
option_setting_ofs0: option-setting-ofs0@100a100 {
539+
compatible = "zephyr,memory-region";
540+
zephyr,memory-region = "OFS_OFS0_MEMORY";
541+
reg = <0x0100a100 0x4>;
542542
status = "okay";
543+
};
543544

544-
option_setting_ofs0: option-setting-ofs0@100a100 {
545-
compatible = "zephyr,memory-region";
546-
zephyr,memory-region = "OFS_OFS0_MEMORY";
547-
reg = <0x0100a100 0x4>;
548-
status = "okay";
549-
};
550-
551-
option_setting_dualsel: option-setting-dualsel@100a110 {
552-
compatible = "zephyr,memory-region";
553-
zephyr,memory-region = "OFS_DUALSEL_MEMORY";
554-
reg = <0x0100a110 0x4>;
555-
status = "okay";
556-
};
545+
option_setting_dualsel: option-setting-dualsel@100a110 {
546+
compatible = "zephyr,memory-region";
547+
zephyr,memory-region = "OFS_DUALSEL_MEMORY";
548+
reg = <0x0100a110 0x4>;
549+
status = "okay";
550+
};
557551

558-
option_setting_ofs1_sec: option-setting-ofs1-sec@100a200 {
559-
compatible = "zephyr,memory-region";
560-
zephyr,memory-region = "OFS_OFS1_SEC_MEMORY";
561-
reg = <0x0100a200 0x4>;
562-
status = "okay";
563-
};
552+
option_setting_ofs1_sec: option-setting-ofs1-sec@100a200 {
553+
compatible = "zephyr,memory-region";
554+
zephyr,memory-region = "OFS_OFS1_SEC_MEMORY";
555+
reg = <0x0100a200 0x4>;
556+
status = "okay";
557+
};
564558

565-
option_setting_banksel_sec: option-setting-banksel-sec@100a210 {
566-
compatible = "zephyr,memory-region";
567-
zephyr,memory-region = "OFS_BANKSEL_SEC_MEMORY";
568-
reg = <0x0100a210 0x4>;
569-
status = "okay";
570-
};
559+
option_setting_banksel_sec: option-setting-banksel-sec@100a210 {
560+
compatible = "zephyr,memory-region";
561+
zephyr,memory-region = "OFS_BANKSEL_SEC_MEMORY";
562+
reg = <0x0100a210 0x4>;
563+
status = "okay";
564+
};
571565

572-
option_setting_bps_sec: option-setting-bps-sec@100a240 {
573-
compatible = "zephyr,memory-region";
574-
zephyr,memory-region = "OFS_BPS_SEC_MEMORY";
575-
reg = <0x0100a240 0xc>;
576-
status = "okay";
577-
};
566+
option_setting_bps_sec: option-setting-bps-sec@100a240 {
567+
compatible = "zephyr,memory-region";
568+
zephyr,memory-region = "OFS_BPS_SEC_MEMORY";
569+
reg = <0x0100a240 0xc>;
570+
status = "okay";
571+
};
578572

579-
option_setting_pbps_sec: option-setting-pbps-sec@100a260 {
580-
compatible = "zephyr,memory-region";
581-
zephyr,memory-region = "OFS_PBPS_SEC_MEMORY";
582-
reg = <0x0100a260 0xc>;
583-
status = "okay";
584-
};
573+
option_setting_pbps_sec: option-setting-pbps-sec@100a260 {
574+
compatible = "zephyr,memory-region";
575+
zephyr,memory-region = "OFS_PBPS_SEC_MEMORY";
576+
reg = <0x0100a260 0xc>;
577+
status = "okay";
578+
};
585579

586-
option_setting_ofs1_sel: option-setting-ofs1-sel@100a280 {
587-
compatible = "zephyr,memory-region";
588-
zephyr,memory-region = "OFS_OFS1_SEL_MEMORY";
589-
reg = <0x0100a280 0x4>;
590-
status = "okay";
591-
};
580+
option_setting_ofs1_sel: option-setting-ofs1-sel@100a280 {
581+
compatible = "zephyr,memory-region";
582+
zephyr,memory-region = "OFS_OFS1_SEL_MEMORY";
583+
reg = <0x0100a280 0x4>;
584+
status = "okay";
585+
};
592586

593-
option_setting_banksel_sel: option-setting-banksel-sel@100a290 {
594-
compatible = "zephyr,memory-region";
595-
zephyr,memory-region = "OFS_BANKSEL_SEL_MEMORY";
596-
reg = <0x0100a290 0x4>;
597-
status = "okay";
598-
};
587+
option_setting_banksel_sel: option-setting-banksel-sel@100a290 {
588+
compatible = "zephyr,memory-region";
589+
zephyr,memory-region = "OFS_BANKSEL_SEL_MEMORY";
590+
reg = <0x0100a290 0x4>;
591+
status = "okay";
592+
};
599593

600-
option_setting_bps_sel: option-setting-bps-sel@100a2c0 {
601-
compatible = "zephyr,memory-region";
602-
zephyr,memory-region = "OFS_BPS_SEL_MEMORY";
603-
reg = <0x0100a2c0 0xc>;
604-
status = "okay";
605-
};
594+
option_setting_bps_sel: option-setting-bps-sel@100a2c0 {
595+
compatible = "zephyr,memory-region";
596+
zephyr,memory-region = "OFS_BPS_SEL_MEMORY";
597+
reg = <0x0100a2c0 0xc>;
598+
status = "okay";
606599
};
607600
};
608601

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

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -69,53 +69,46 @@
6969
status = "disabled";
7070
};
7171

72-
option-setting-ofs-conf@100a100 {
73-
reg = <0x0100a100 0x200>;
74-
#address-cells = <1>;
75-
#size-cells = <1>;
72+
option_setting_ofs0: option-setting-ofs0@100a100 {
73+
compatible = "zephyr,memory-region";
74+
zephyr,memory-region = "OFS_OFS0_MEMORY";
75+
reg = <0x0100a100 0x4>;
7676
status = "okay";
77+
};
7778

78-
option_setting_ofs0: option-setting-ofs0@100a100 {
79-
compatible = "zephyr,memory-region";
80-
zephyr,memory-region = "OFS_OFS0_MEMORY";
81-
reg = <0x0100a100 0x4>;
82-
status = "okay";
83-
};
84-
85-
option_setting_ofs1_sec: option-setting-ofs1-sec@100a200 {
86-
compatible = "zephyr,memory-region";
87-
zephyr,memory-region = "OFS_OFS1_SEC_MEMORY";
88-
reg = <0x0100a200 0x4>;
89-
status = "okay";
90-
};
79+
option_setting_ofs1_sec: option-setting-ofs1-sec@100a200 {
80+
compatible = "zephyr,memory-region";
81+
zephyr,memory-region = "OFS_OFS1_SEC_MEMORY";
82+
reg = <0x0100a200 0x4>;
83+
status = "okay";
84+
};
9185

92-
option_setting_bps_sec: option-setting-bps-sec@100a240 {
93-
compatible = "zephyr,memory-region";
94-
zephyr,memory-region = "OFS_BPS_SEC_MEMORY";
95-
reg = <0x0100a240 0x4>;
96-
status = "okay";
97-
};
86+
option_setting_bps_sec: option-setting-bps-sec@100a240 {
87+
compatible = "zephyr,memory-region";
88+
zephyr,memory-region = "OFS_BPS_SEC_MEMORY";
89+
reg = <0x0100a240 0x4>;
90+
status = "okay";
91+
};
9892

99-
option_setting_pbps_sec: option-setting-pbps-sec@100a260 {
100-
compatible = "zephyr,memory-region";
101-
zephyr,memory-region = "OFS_PBPS_SEC_MEMORY";
102-
reg = <0x0100a260 0x4>;
103-
status = "okay";
104-
};
93+
option_setting_pbps_sec: option-setting-pbps-sec@100a260 {
94+
compatible = "zephyr,memory-region";
95+
zephyr,memory-region = "OFS_PBPS_SEC_MEMORY";
96+
reg = <0x0100a260 0x4>;
97+
status = "okay";
98+
};
10599

106-
option_setting_ofs1_sel: option-setting-ofs1-sel@100a280 {
107-
compatible = "zephyr,memory-region";
108-
zephyr,memory-region = "OFS_OFS1_SEL_MEMORY";
109-
reg = <0x0100a280 0x4>;
110-
status = "okay";
111-
};
100+
option_setting_ofs1_sel: option-setting-ofs1-sel@100a280 {
101+
compatible = "zephyr,memory-region";
102+
zephyr,memory-region = "OFS_OFS1_SEL_MEMORY";
103+
reg = <0x0100a280 0x4>;
104+
status = "okay";
105+
};
112106

113-
option_setting_bps_sel: option-setting-bps-sel@100a2c0 {
114-
compatible = "zephyr,memory-region";
115-
zephyr,memory-region = "OFS_BPS_SEL_MEMORY";
116-
reg = <0x0100a2c0 0x4>;
117-
status = "okay";
118-
};
107+
option_setting_bps_sel: option-setting-bps-sel@100a2c0 {
108+
compatible = "zephyr,memory-region";
109+
zephyr,memory-region = "OFS_BPS_SEL_MEMORY";
110+
reg = <0x0100a2c0 0x4>;
111+
status = "okay";
119112
};
120113
};
121114

0 commit comments

Comments
 (0)