修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/am33xx-clocks.dtsi
..
..
@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Device Tree Source for AM33xx clock data
3
4
  *
4
5
  * Copyright (C) 2013 Texas Instruments, Inc.
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  */
10
7
 &scm_clocks {
11
8
 	sys_clkin_ck: sys_clkin_ck@40 {
..
..
@@ -334,49 +331,49 @@
334
331
 	timer1_fck: timer1_fck@528 {
335
332
 		#clock-cells = <0>;
336
333
 		compatible = "ti,mux-clock";
337
-		clocks = <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>;
334
+		clocks = <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>;
338
335
 		reg = <0x0528>;
339
336
 	};
340
337
 
341
338
 	timer2_fck: timer2_fck@508 {
342
339
 		#clock-cells = <0>;
343
340
 		compatible = "ti,mux-clock";
344
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
341
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
345
342
 		reg = <0x0508>;
346
343
 	};
347
344
 
348
345
 	timer3_fck: timer3_fck@50c {
349
346
 		#clock-cells = <0>;
350
347
 		compatible = "ti,mux-clock";
351
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
348
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
352
349
 		reg = <0x050c>;
353
350
 	};
354
351
 
355
352
 	timer4_fck: timer4_fck@510 {
356
353
 		#clock-cells = <0>;
357
354
 		compatible = "ti,mux-clock";
358
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
355
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
359
356
 		reg = <0x0510>;
360
357
 	};
361
358
 
362
359
 	timer5_fck: timer5_fck@518 {
363
360
 		#clock-cells = <0>;
364
361
 		compatible = "ti,mux-clock";
365
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
362
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
366
363
 		reg = <0x0518>;
367
364
 	};
368
365
 
369
366
 	timer6_fck: timer6_fck@51c {
370
367
 		#clock-cells = <0>;
371
368
 		compatible = "ti,mux-clock";
372
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
369
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
373
370
 		reg = <0x051c>;
374
371
 	};
375
372
 
376
373
 	timer7_fck: timer7_fck@504 {
377
374
 		#clock-cells = <0>;
378
375
 		compatible = "ti,mux-clock";
379
-		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
376
+		clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
380
377
 		reg = <0x0504>;
381
378
 	};
382
379
 
..
..
@@ -407,7 +404,7 @@
407
404
 	wdt1_fck: wdt1_fck@538 {
408
405
 		#clock-cells = <0>;
409
406
 		compatible = "ti,mux-clock";
410
-		clocks = <&clk_rc32k_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
407
+		clocks = <&clk_rc32k_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
411
408
 		reg = <0x0538>;
412
409
 	};
413
410
 
..
..
@@ -477,7 +474,7 @@
477
474
 	gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@53c {
478
475
 		#clock-cells = <0>;
479
476
 		compatible = "ti,mux-clock";
480
-		clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>;
477
+		clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
481
478
 		reg = <0x053c>;
482
479
 	};
483
480
 
..
..
@@ -539,86 +536,140 @@
539
536
 };
540
537
 
541
538
 &prcm {
542
-	l4_per_cm: l4_per_cm@0 {
539
+	per_cm: per-cm@0 {
543
540
 		compatible = "ti,omap4-cm";
544
-		reg = <0x0 0x200>;
541
+		reg = <0x0 0x400>;
545
542
 		#address-cells = <1>;
546
543
 		#size-cells = <1>;
547
-		ranges = <0 0x0 0x200>;
544
+		ranges = <0 0x0 0x400>;
548
545
 
549
-		l4_per_clkctrl: clk@14 {
546
+		l4ls_clkctrl: l4ls-clkctrl@38 {
550
547
 			compatible = "ti,clkctrl";
551
-			reg = <0x14 0x13c>;
548
+			reg = <0x38 0x2c>, <0x6c 0x28>, <0xac 0xc>, <0xc0 0x1c>, <0xec 0xc>, <0x10c 0x8>, <0x130 0x4>;
549
+			#clock-cells = <2>;
550
+		};
551
+
552
+		l3s_clkctrl: l3s-clkctrl@1c {
553
+			compatible = "ti,clkctrl";
554
+			reg = <0x1c 0x4>, <0x30 0x8>, <0x68 0x4>, <0xf8 0x4>;
555
+			#clock-cells = <2>;
556
+		};
557
+
558
+		l3_clkctrl: l3-clkctrl@24 {
559
+			compatible = "ti,clkctrl";
560
+			reg = <0x24 0xc>, <0x94 0x10>, <0xbc 0x4>, <0xdc 0x8>, <0xfc 0x8>;
561
+			#clock-cells = <2>;
562
+		};
563
+
564
+		l4hs_clkctrl: l4hs-clkctrl@120 {
565
+			compatible = "ti,clkctrl";
566
+			reg = <0x120 0x4>;
567
+			#clock-cells = <2>;
568
+		};
569
+
570
+		pruss_ocp_clkctrl: pruss-ocp-clkctrl@e8 {
571
+			compatible = "ti,clkctrl";
572
+			reg = <0xe8 0x4>;
573
+			#clock-cells = <2>;
574
+		};
575
+
576
+		cpsw_125mhz_clkctrl: cpsw-125mhz-clkctrl@0 {
577
+			compatible = "ti,clkctrl";
578
+			reg = <0x0 0x18>;
579
+			#clock-cells = <2>;
580
+		};
581
+
582
+		lcdc_clkctrl: lcdc-clkctrl@18 {
583
+			compatible = "ti,clkctrl";
584
+			reg = <0x18 0x4>;
585
+			#clock-cells = <2>;
586
+		};
587
+
588
+		clk_24mhz_clkctrl: clk-24mhz-clkctrl@14c {
589
+			compatible = "ti,clkctrl";
590
+			reg = <0x14c 0x4>;
552
591
 			#clock-cells = <2>;
553
592
 		};
554
593
 	};
555
594
 
556
-	l4_wkup_cm: l4_wkup_cm@400 {
595
+	wkup_cm: wkup-cm@400 {
557
596
 		compatible = "ti,omap4-cm";
558
597
 		reg = <0x400 0x100>;
559
598
 		#address-cells = <1>;
560
599
 		#size-cells = <1>;
561
600
 		ranges = <0 0x400 0x100>;
562
601
 
563
-		l4_wkup_clkctrl: clk@4 {
602
+		l4_wkup_clkctrl: l4-wkup-clkctrl@0 {
564
603
 			compatible = "ti,clkctrl";
565
-			reg = <0x4 0xd4>;
604
+			reg = <0x0 0x10>, <0xb4 0x24>;
605
+			#clock-cells = <2>;
606
+		};
607
+
608
+		l3_aon_clkctrl: l3-aon-clkctrl@14 {
609
+			compatible = "ti,clkctrl";
610
+			reg = <0x14 0x4>;
611
+			#clock-cells = <2>;
612
+		};
613
+
614
+		l4_wkup_aon_clkctrl: l4-wkup-aon-clkctrl@b0 {
615
+			compatible = "ti,clkctrl";
616
+			reg = <0xb0 0x4>;
566
617
 			#clock-cells = <2>;
567
618
 		};
568
619
 	};
569
620
 
570
-	mpu_cm: mpu_cm@600 {
621
+	mpu_cm: mpu-cm@600 {
571
622
 		compatible = "ti,omap4-cm";
572
623
 		reg = <0x600 0x100>;
573
624
 		#address-cells = <1>;
574
625
 		#size-cells = <1>;
575
626
 		ranges = <0 0x600 0x100>;
576
627
 
577
-		mpu_clkctrl: clk@4 {
628
+		mpu_clkctrl: mpu-clkctrl@0 {
578
629
 			compatible = "ti,clkctrl";
579
-			reg = <0x4 0x4>;
630
+			reg = <0x0 0x8>;
580
631
 			#clock-cells = <2>;
581
632
 		};
582
633
 	};
583
634
 
584
-	l4_rtc_cm: l4_rtc_cm@800 {
635
+	l4_rtc_cm: l4-rtc-cm@800 {
585
636
 		compatible = "ti,omap4-cm";
586
637
 		reg = <0x800 0x100>;
587
638
 		#address-cells = <1>;
588
639
 		#size-cells = <1>;
589
640
 		ranges = <0 0x800 0x100>;
590
641
 
591
-		l4_rtc_clkctrl: clk@0 {
642
+		l4_rtc_clkctrl: l4-rtc-clkctrl@0 {
592
643
 			compatible = "ti,clkctrl";
593
644
 			reg = <0x0 0x4>;
594
645
 			#clock-cells = <2>;
595
646
 		};
596
647
 	};
597
648
 
598
-	gfx_l3_cm: gfx_l3_cm@900 {
649
+	gfx_l3_cm: gfx-l3-cm@900 {
599
650
 		compatible = "ti,omap4-cm";
600
651
 		reg = <0x900 0x100>;
601
652
 		#address-cells = <1>;
602
653
 		#size-cells = <1>;
603
654
 		ranges = <0 0x900 0x100>;
604
655
 
605
-		gfx_l3_clkctrl: clk@4 {
656
+		gfx_l3_clkctrl: gfx-l3-clkctrl@0 {
606
657
 			compatible = "ti,clkctrl";
607
-			reg = <0x4 0x4>;
658
+			reg = <0x0 0x8>;
608
659
 			#clock-cells = <2>;
609
660
 		};
610
661
 	};
611
662
 
612
-	l4_cefuse_cm: l4_cefuse_cm@a00 {
663
+	l4_cefuse_cm: l4-cefuse-cm@a00 {
613
664
 		compatible = "ti,omap4-cm";
614
665
 		reg = <0xa00 0x100>;
615
666
 		#address-cells = <1>;
616
667
 		#size-cells = <1>;
617
668
 		ranges = <0 0xa00 0x100>;
618
669
 
619
-		l4_cefuse_clkctrl: clk@20 {
670
+		l4_cefuse_clkctrl: l4-cefuse-clkctrl@0 {
620
671
 			compatible = "ti,clkctrl";
621
-			reg = <0x20 0x4>;
672
+			reg = <0x0 0x24>;
622
673
 			#clock-cells = <2>;
623
674
 		};
624
675
 	};