Skip to content

Commit bec0948

Browse files
geertuhorms
geertu
authored and
horms
committed
arm64: dts: r8a7796: Add reset control properties
Add properties to describe the reset topology for on-SoC devices: - Add the "#reset-cells" property to the CPG/MSSR device node, - Add resets and reset-names properties to the various device nodes. This allows to reset SoC devices using the Reset Controller API. Note that all resets added match the corresponding module clocks. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
1 parent dcccc13 commit bec0948

File tree

1 file changed

+46
-0
lines changed

1 file changed

+46
-0
lines changed

‎arch/arm64/boot/dts/renesas/r8a7796.dtsi

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
clocks = <&cpg CPG_MOD 408>;
156156
clock-names = "clk";
157157
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
158+
resets = <&cpg 408>;
158159
};
159160

160161
timer {
@@ -175,6 +176,7 @@
175176
reg = <0 0xe6020000 0 0x0c>;
176177
clocks = <&cpg CPG_MOD 402>;
177178
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
179+
resets = <&cpg 402>;
178180
status = "disabled";
179181
};
180182

@@ -190,6 +192,7 @@
190192
interrupt-controller;
191193
clocks = <&cpg CPG_MOD 912>;
192194
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
195+
resets = <&cpg 912>;
193196
};
194197

195198
gpio1: gpio@e6051000 {
@@ -204,6 +207,7 @@
204207
interrupt-controller;
205208
clocks = <&cpg CPG_MOD 911>;
206209
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
210+
resets = <&cpg 911>;
207211
};
208212

209213
gpio2: gpio@e6052000 {
@@ -218,6 +222,7 @@
218222
interrupt-controller;
219223
clocks = <&cpg CPG_MOD 910>;
220224
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
225+
resets = <&cpg 910>;
221226
};
222227

223228
gpio3: gpio@e6053000 {
@@ -232,6 +237,7 @@
232237
interrupt-controller;
233238
clocks = <&cpg CPG_MOD 909>;
234239
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
240+
resets = <&cpg 909>;
235241
};
236242

237243
gpio4: gpio@e6054000 {
@@ -246,6 +252,7 @@
246252
interrupt-controller;
247253
clocks = <&cpg CPG_MOD 908>;
248254
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
255+
resets = <&cpg 908>;
249256
};
250257

251258
gpio5: gpio@e6055000 {
@@ -260,6 +267,7 @@
260267
interrupt-controller;
261268
clocks = <&cpg CPG_MOD 907>;
262269
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
270+
resets = <&cpg 907>;
263271
};
264272

265273
gpio6: gpio@e6055400 {
@@ -274,6 +282,7 @@
274282
interrupt-controller;
275283
clocks = <&cpg CPG_MOD 906>;
276284
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
285+
resets = <&cpg 906>;
277286
};
278287

279288
gpio7: gpio@e6055800 {
@@ -288,6 +297,7 @@
288297
interrupt-controller;
289298
clocks = <&cpg CPG_MOD 905>;
290299
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
300+
resets = <&cpg 905>;
291301
};
292302

293303
pfc: pin-controller@e6060000 {
@@ -322,6 +332,7 @@
322332
clock-names = "extal", "extalr";
323333
#clock-cells = <2>;
324334
#power-domain-cells = <0>;
335+
#reset-cells = <1>;
325336
};
326337

327338
rst: reset-controller@e6160000 {
@@ -350,6 +361,7 @@
350361
interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
351362
clocks = <&cpg CPG_MOD 926>;
352363
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
364+
resets = <&cpg 926>;
353365
status = "disabled";
354366
};
355367

@@ -362,6 +374,7 @@
362374
interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
363375
clocks = <&cpg CPG_MOD 931>;
364376
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
377+
resets = <&cpg 931>;
365378
dmas = <&dmac1 0x91>, <&dmac1 0x90>,
366379
<&dmac2 0x91>, <&dmac2 0x90>;
367380
dma-names = "tx", "rx", "tx", "rx";
@@ -378,6 +391,7 @@
378391
interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
379392
clocks = <&cpg CPG_MOD 930>;
380393
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
394+
resets = <&cpg 930>;
381395
dmas = <&dmac1 0x93>, <&dmac1 0x92>,
382396
<&dmac2 0x93>, <&dmac2 0x92>;
383397
dma-names = "tx", "rx", "tx", "rx";
@@ -394,6 +408,7 @@
394408
interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
395409
clocks = <&cpg CPG_MOD 929>;
396410
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
411+
resets = <&cpg 929>;
397412
dmas = <&dmac1 0x95>, <&dmac1 0x94>,
398413
<&dmac2 0x95>, <&dmac2 0x94>;
399414
dma-names = "tx", "rx", "tx", "rx";
@@ -410,6 +425,7 @@
410425
interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
411426
clocks = <&cpg CPG_MOD 928>;
412427
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
428+
resets = <&cpg 928>;
413429
dmas = <&dmac0 0x97>, <&dmac0 0x96>;
414430
dma-names = "tx", "rx";
415431
i2c-scl-internal-delay-ns = <110>;
@@ -425,6 +441,7 @@
425441
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
426442
clocks = <&cpg CPG_MOD 927>;
427443
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
444+
resets = <&cpg 927>;
428445
dmas = <&dmac0 0x99>, <&dmac0 0x98>;
429446
dma-names = "tx", "rx";
430447
i2c-scl-internal-delay-ns = <110>;
@@ -440,6 +457,7 @@
440457
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
441458
clocks = <&cpg CPG_MOD 919>;
442459
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
460+
resets = <&cpg 919>;
443461
dmas = <&dmac0 0x9b>, <&dmac0 0x9a>;
444462
dma-names = "tx", "rx";
445463
i2c-scl-internal-delay-ns = <110>;
@@ -455,6 +473,7 @@
455473
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
456474
clocks = <&cpg CPG_MOD 918>;
457475
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
476+
resets = <&cpg 918>;
458477
dmas = <&dmac0 0x9d>, <&dmac0 0x9c>;
459478
dma-names = "tx", "rx";
460479
i2c-scl-internal-delay-ns = <6>;
@@ -473,6 +492,7 @@
473492
assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
474493
assigned-clock-rates = <40000000>;
475494
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
495+
resets = <&cpg 916>;
476496
status = "disabled";
477497
};
478498

@@ -488,6 +508,7 @@
488508
assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
489509
assigned-clock-rates = <40000000>;
490510
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
511+
resets = <&cpg 915>;
491512
status = "disabled";
492513
};
493514

@@ -504,6 +525,7 @@
504525
assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
505526
assigned-clock-rates = <40000000>;
506527
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
528+
resets = <&cpg 914>;
507529
status = "disabled";
508530

509531
channel0 {
@@ -553,6 +575,7 @@
553575
"ch24";
554576
clocks = <&cpg CPG_MOD 812>;
555577
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
578+
resets = <&cpg 812>;
556579
phy-mode = "rgmii-txid";
557580
#address-cells = <1>;
558581
#size-cells = <0>;
@@ -573,6 +596,7 @@
573596
<&dmac2 0x31>, <&dmac2 0x30>;
574597
dma-names = "tx", "rx", "tx", "rx";
575598
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
599+
resets = <&cpg 520>;
576600
status = "disabled";
577601
};
578602

@@ -590,6 +614,7 @@
590614
<&dmac2 0x33>, <&dmac2 0x32>;
591615
dma-names = "tx", "rx", "tx", "rx";
592616
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
617+
resets = <&cpg 519>;
593618
status = "disabled";
594619
};
595620

@@ -607,6 +632,7 @@
607632
<&dmac2 0x35>, <&dmac2 0x34>;
608633
dma-names = "tx", "rx", "tx", "rx";
609634
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
635+
resets = <&cpg 518>;
610636
status = "disabled";
611637
};
612638

@@ -623,6 +649,7 @@
623649
dmas = <&dmac0 0x37>, <&dmac0 0x36>;
624650
dma-names = "tx", "rx";
625651
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
652+
resets = <&cpg 517>;
626653
status = "disabled";
627654
};
628655

@@ -639,6 +666,7 @@
639666
dmas = <&dmac0 0x39>, <&dmac0 0x38>;
640667
dma-names = "tx", "rx";
641668
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
669+
resets = <&cpg 516>;
642670
status = "disabled";
643671
};
644672

@@ -655,6 +683,7 @@
655683
<&dmac2 0x51>, <&dmac2 0x50>;
656684
dma-names = "tx", "rx", "tx", "rx";
657685
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
686+
resets = <&cpg 207>;
658687
status = "disabled";
659688
};
660689

@@ -671,6 +700,7 @@
671700
<&dmac2 0x53>, <&dmac2 0x52>;
672701
dma-names = "tx", "rx", "tx", "rx";
673702
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
703+
resets = <&cpg 206>;
674704
status = "disabled";
675705
};
676706

@@ -684,6 +714,7 @@
684714
<&scif_clk>;
685715
clock-names = "fck", "brg_int", "scif_clk";
686716
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
717+
resets = <&cpg 310>;
687718
status = "disabled";
688719
};
689720

@@ -699,6 +730,7 @@
699730
dmas = <&dmac0 0x57>, <&dmac0 0x56>;
700731
dma-names = "tx", "rx";
701732
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
733+
resets = <&cpg 204>;
702734
status = "disabled";
703735
};
704736

@@ -714,6 +746,7 @@
714746
dmas = <&dmac0 0x59>, <&dmac0 0x58>;
715747
dma-names = "tx", "rx";
716748
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
749+
resets = <&cpg 203>;
717750
status = "disabled";
718751
};
719752

@@ -730,6 +763,7 @@
730763
<&dmac2 0x5b>, <&dmac2 0x5a>;
731764
dma-names = "tx", "rx", "tx", "rx";
732765
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
766+
resets = <&cpg 202>;
733767
status = "disabled";
734768
};
735769

@@ -743,6 +777,7 @@
743777
<&dmac2 0x41>, <&dmac2 0x40>;
744778
dma-names = "tx", "rx";
745779
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
780+
resets = <&cpg 211>;
746781
#address-cells = <1>;
747782
#size-cells = <0>;
748783
status = "disabled";
@@ -758,6 +793,7 @@
758793
<&dmac2 0x43>, <&dmac2 0x42>;
759794
dma-names = "tx", "rx";
760795
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
796+
resets = <&cpg 210>;
761797
#address-cells = <1>;
762798
#size-cells = <0>;
763799
status = "disabled";
@@ -772,6 +808,7 @@
772808
dmas = <&dmac0 0x45>, <&dmac0 0x44>;
773809
dma-names = "tx", "rx";
774810
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
811+
resets = <&cpg 209>;
775812
#address-cells = <1>;
776813
#size-cells = <0>;
777814
status = "disabled";
@@ -786,6 +823,7 @@
786823
dmas = <&dmac0 0x47>, <&dmac0 0x46>;
787824
dma-names = "tx", "rx";
788825
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
826+
resets = <&cpg 208>;
789827
#address-cells = <1>;
790828
#size-cells = <0>;
791829
status = "disabled";
@@ -820,6 +858,7 @@
820858
clocks = <&cpg CPG_MOD 219>;
821859
clock-names = "fck";
822860
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
861+
resets = <&cpg 219>;
823862
#dma-cells = <1>;
824863
dma-channels = <16>;
825864
};
@@ -853,6 +892,7 @@
853892
clocks = <&cpg CPG_MOD 218>;
854893
clock-names = "fck";
855894
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
895+
resets = <&cpg 218>;
856896
#dma-cells = <1>;
857897
dma-channels = <16>;
858898
};
@@ -886,6 +926,7 @@
886926
clocks = <&cpg CPG_MOD 217>;
887927
clock-names = "fck";
888928
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
929+
resets = <&cpg 217>;
889930
#dma-cells = <1>;
890931
dma-channels = <16>;
891932
};
@@ -897,6 +938,7 @@
897938
clocks = <&cpg CPG_MOD 314>;
898939
max-frequency = <200000000>;
899940
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
941+
resets = <&cpg 314>;
900942
status = "disabled";
901943
};
902944

@@ -907,6 +949,7 @@
907949
clocks = <&cpg CPG_MOD 313>;
908950
max-frequency = <200000000>;
909951
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
952+
resets = <&cpg 313>;
910953
status = "disabled";
911954
};
912955

@@ -917,6 +960,7 @@
917960
clocks = <&cpg CPG_MOD 312>;
918961
max-frequency = <200000000>;
919962
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
963+
resets = <&cpg 312>;
920964
status = "disabled";
921965
};
922966

@@ -927,6 +971,7 @@
927971
clocks = <&cpg CPG_MOD 311>;
928972
max-frequency = <200000000>;
929973
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
974+
resets = <&cpg 311>;
930975
status = "disabled";
931976
};
932977

@@ -940,6 +985,7 @@
940985
<GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
941986
clocks = <&cpg CPG_MOD 522>;
942987
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
988+
resets = <&cpg 522>;
943989
#thermal-sensor-cells = <1>;
944990
status = "okay";
945991
};

0 commit comments

Comments
 (0)