Skip to content

Commit f0cba6f

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm64-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.13: - Add PWM nodes for Amlogic A1 & C3 - Addd missing power-domains properties - Fix G12 uart node name * tag 'amlogic-arm64-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: amlogic: Add Amlogic C3 PWM arm64: dts: meson-g12-common: fix uart-ao-a typo arm64: dts: meson: a1: bind power domain to temperature sensor arm64: dts: meson: a1: add definitions for meson PWM Link: https://lore.kernel.org/r/6fb3d64a-3913-4db0-9cdc-336af32a88a9@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents bf76260 + be90cd4 commit f0cba6f

3 files changed

Lines changed: 581 additions & 1 deletion

File tree

‎arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi‎

Lines changed: 364 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,300 @@
410410
drive-strength-microamp = <4000>;
411411
};
412412
};
413+
414+
pwm_a_pins1: pwm-a-pins1 {
415+
mux {
416+
groups = "pwm_a";
417+
function = "pwm_a";
418+
};
419+
};
420+
421+
pwm_b_pins1: pwm-b-pins1 {
422+
mux {
423+
groups = "pwm_b";
424+
function = "pwm_b";
425+
};
426+
};
427+
428+
pwm_c_pins1: pwm-c-pins1 {
429+
mux {
430+
groups = "pwm_c";
431+
function = "pwm_c";
432+
};
433+
};
434+
435+
pwm_d_pins1: pwm-d-pins1 {
436+
mux {
437+
groups = "pwm_d";
438+
function = "pwm_d";
439+
};
440+
};
441+
442+
pwm_e_pins1: pwm-e-pins1 {
443+
mux {
444+
groups = "pwm_e";
445+
function = "pwm_e";
446+
};
447+
};
448+
449+
pwm_f_pins1: pwm-f-pins1 {
450+
mux {
451+
groups = "pwm_f";
452+
function = "pwm_f";
453+
};
454+
};
455+
456+
pwm_g_pins1: pwm-g-pins1 {
457+
mux {
458+
groups = "pwm_g_b";
459+
function = "pwm_g";
460+
};
461+
};
462+
463+
pwm_g_pins2: pwm-g-pins2 {
464+
mux {
465+
groups = "pwm_g_c";
466+
function = "pwm_g";
467+
};
468+
};
469+
470+
pwm_g_pins3: pwm-g-pins3 {
471+
mux {
472+
groups = "pwm_g_d";
473+
function = "pwm_g";
474+
};
475+
};
476+
477+
pwm_g_pins4: pwm-g-pins4 {
478+
mux {
479+
groups = "pwm_g_x0";
480+
function = "pwm_g";
481+
};
482+
};
483+
484+
pwm_g_pins5: pwm-g-pins5 {
485+
mux {
486+
groups = "pwm_g_x8";
487+
function = "pwm_g";
488+
};
489+
};
490+
491+
pwm_h_pins1: pwm-h-pins1 {
492+
mux {
493+
groups = "pwm_h_b";
494+
function = "pwm_h";
495+
};
496+
};
497+
498+
pwm_h_pins2: pwm-h-pins2 {
499+
mux {
500+
groups = "pwm_h_c";
501+
function = "pwm_h";
502+
};
503+
};
504+
505+
pwm_h_pins3: pwm-h-pins3 {
506+
mux {
507+
groups = "pwm_h_d";
508+
function = "pwm_h";
509+
};
510+
};
511+
512+
pwm_h_pins4: pwm-h-pins4 {
513+
mux {
514+
groups = "pwm_h_x1";
515+
function = "pwm_h";
516+
};
517+
};
518+
519+
pwm_h_pins5: pwm-h-pins5 {
520+
mux {
521+
groups = "pwm_h_x9";
522+
function = "pwm_h";
523+
};
524+
};
525+
526+
pwm_i_pins1: pwm-i-pins1 {
527+
mux {
528+
groups = "pwm_i_b";
529+
function = "pwm_i";
530+
};
531+
};
532+
533+
pwm_i_pins2: pwm-i-pins2 {
534+
mux {
535+
groups = "pwm_i_c";
536+
function = "pwm_i";
537+
};
538+
};
539+
540+
pwm_i_pins3: pwm-i-pins3 {
541+
mux {
542+
groups = "pwm_i_d";
543+
function = "pwm_i";
544+
};
545+
};
546+
547+
pwm_i_pins4: pwm-i-pins4 {
548+
mux {
549+
groups = "pwm_i_x2";
550+
function = "pwm_i";
551+
};
552+
};
553+
554+
pwm_i_pins5: pwm-i-pins5 {
555+
mux {
556+
groups = "pwm_i_x10";
557+
function = "pwm_i";
558+
};
559+
};
560+
561+
pwm_j_pins1: pwm-j-pins1 {
562+
mux {
563+
groups = "pwm_j_c";
564+
function = "pwm_j";
565+
};
566+
};
567+
568+
pwm_j_pins2: pwm-j-pins2 {
569+
mux {
570+
groups = "pwm_j_d";
571+
function = "pwm_j";
572+
};
573+
};
574+
575+
pwm_j_pins3: pwm-j-pins3 {
576+
mux {
577+
groups = "pwm_j_b";
578+
function = "pwm_j";
579+
};
580+
};
581+
582+
pwm_j_pins4: pwm-j-pins4 {
583+
mux {
584+
groups = "pwm_j_x3";
585+
function = "pwm_j";
586+
};
587+
};
588+
589+
pwm_j_pins5: pwm-j-pins5 {
590+
mux {
591+
groups = "pwm_j_x12";
592+
function = "pwm_j";
593+
};
594+
};
595+
596+
pwm_k_pins1: pwm-k-pins1 {
597+
mux {
598+
groups = "pwm_k_c";
599+
function = "pwm_k";
600+
};
601+
};
602+
603+
pwm_k_pins2: pwm-k-pins2 {
604+
mux {
605+
groups = "pwm_k_d";
606+
function = "pwm_k";
607+
};
608+
};
609+
610+
pwm_k_pins3: pwm-k-pins3 {
611+
mux {
612+
groups = "pwm_k_b";
613+
function = "pwm_k";
614+
};
615+
};
616+
617+
pwm_k_pins4: pwm-k-pins4 {
618+
mux {
619+
groups = "pwm_k_x4";
620+
function = "pwm_k";
621+
};
622+
};
623+
624+
pwm_k_pins5: pwm-k-pins5 {
625+
mux {
626+
groups = "pwm_k_x13";
627+
function = "pwm_k";
628+
};
629+
};
630+
631+
pwm_l_pins1: pwm-l-pins1 {
632+
mux {
633+
groups = "pwm_l_c";
634+
function = "pwm_l";
635+
};
636+
};
637+
638+
pwm_l_pins2: pwm-l-pins2 {
639+
mux {
640+
groups = "pwm_l_x";
641+
function = "pwm_l";
642+
};
643+
};
644+
645+
pwm_l_pins3: pwm-l-pins3 {
646+
mux {
647+
groups = "pwm_l_b";
648+
function = "pwm_l";
649+
};
650+
};
651+
652+
pwm_l_pins4: pwm-l-pins4 {
653+
mux {
654+
groups = "pwm_l_a";
655+
function = "pwm_l";
656+
};
657+
};
658+
659+
pwm_m_pins1: pwm-m-pins1 {
660+
mux {
661+
groups = "pwm_m_c";
662+
function = "pwm_m";
663+
};
664+
};
665+
666+
pwm_m_pins2: pwm-m-pins2 {
667+
mux {
668+
groups = "pwm_m_x";
669+
function = "pwm_m";
670+
};
671+
};
672+
673+
pwm_m_pins3: pwm-m-pins3 {
674+
mux {
675+
groups = "pwm_m_a";
676+
function = "pwm_m";
677+
};
678+
};
679+
680+
pwm_m_pins4: pwm-m-pins4 {
681+
mux {
682+
groups = "pwm_m_b";
683+
function = "pwm_m";
684+
};
685+
};
686+
687+
pwm_n_pins1: pwm-n-pins1 {
688+
mux {
689+
groups = "pwm_n_x";
690+
function = "pwm_n";
691+
};
692+
};
693+
694+
pwm_n_pins2: pwm-n-pins2 {
695+
mux {
696+
groups = "pwm_n_a";
697+
function = "pwm_n";
698+
};
699+
};
700+
701+
pwm_n_pins3: pwm-n-pins3 {
702+
mux {
703+
groups = "pwm_n_b";
704+
function = "pwm_n";
705+
};
706+
};
413707
};
414708

415709
gpio_intc: interrupt-controller@4080 {
@@ -490,6 +784,16 @@
490784
status = "disabled";
491785
};
492786

787+
pwm_mn: pwm@54000 {
788+
compatible = "amlogic,c3-pwm",
789+
"amlogic,meson-s4-pwm";
790+
reg = <0x0 54000 0x0 0x24>;
791+
clocks = <&clkc_periphs CLKID_PWM_M>,
792+
<&clkc_periphs CLKID_PWM_N>;
793+
#pwm-cells = <3>;
794+
status = "disabled";
795+
};
796+
493797
spifc: spi@56000 {
494798
compatible = "amlogic,a1-spifc";
495799
reg = <0x0 0x56000 0x0 0x290>;
@@ -499,6 +803,66 @@
499803
status = "disabled";
500804
};
501805

806+
pwm_ab: pwm@58000 {
807+
compatible = "amlogic,c3-pwm",
808+
"amlogic,meson-s4-pwm";
809+
reg = <0x0 0x58000 0x0 0x24>;
810+
clocks = <&clkc_periphs CLKID_PWM_A>,
811+
<&clkc_periphs CLKID_PWM_B>;
812+
#pwm-cells = <3>;
813+
status = "disabled";
814+
};
815+
816+
pwm_cd: pwm@5a000 {
817+
compatible = "amlogic,c3-pwm",
818+
"amlogic,meson-s4-pwm";
819+
reg = <0x0 0x5a000 0x0 0x24>;
820+
clocks = <&clkc_periphs CLKID_PWM_C>,
821+
<&clkc_periphs CLKID_PWM_D>;
822+
#pwm-cells = <3>;
823+
status = "disabled";
824+
};
825+
826+
pwm_ef: pwm@5c000 {
827+
compatible = "amlogic,c3-pwm",
828+
"amlogic,meson-s4-pwm";
829+
reg = <0x0 0x5c000 0x0 0x24>;
830+
clocks = <&clkc_periphs CLKID_PWM_E>,
831+
<&clkc_periphs CLKID_PWM_F>;
832+
#pwm-cells = <3>;
833+
status = "disabled";
834+
};
835+
836+
pwm_gh: pwm@5e000 {
837+
compatible = "amlogic,c3-pwm",
838+
"amlogic,meson-s4-pwm";
839+
reg = <0x0 0x5e000 0x0 0x24>;
840+
clocks = <&clkc_periphs CLKID_PWM_G>,
841+
<&clkc_periphs CLKID_PWM_H>;
842+
#pwm-cells = <3>;
843+
status = "disabled";
844+
};
845+
846+
pwm_ij: pwm@60000 {
847+
compatible = "amlogic,c3-pwm",
848+
"amlogic,meson-s4-pwm";
849+
reg = <0x0 0x60000 0x0 0x24>;
850+
clocks = <&clkc_periphs CLKID_PWM_I>,
851+
<&clkc_periphs CLKID_PWM_J>;
852+
#pwm-cells = <3>;
853+
status = "disabled";
854+
};
855+
856+
pwm_kl: pwm@62000 {
857+
compatible = "amlogic,c3-pwm",
858+
"amlogic,meson-s4-pwm";
859+
reg = <0x0 0x62000 0x0 0x24>;
860+
clocks = <&clkc_periphs CLKID_PWM_K>,
861+
<&clkc_periphs CLKID_PWM_L>;
862+
#pwm-cells = <3>;
863+
status = "disabled";
864+
};
865+
502866
i2c0: i2c@66000 {
503867
compatible = "amlogic,meson-axg-i2c";
504868
reg = <0x0 0x66000 0x0 0x24>;

0 commit comments

Comments
 (0)