forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87 
 kernel/arch/arm/boot/dts/tegra124-nyan.dtsi
....@@ -48,6 +48,9 @@
4848 		sor@54540000 {
4949 			status = "okay";
5050 
51
+			avdd-io-hdmi-dp-supply = <&vdd_3v3_hdmi>;
52
+			vdd-hdmi-dp-pll-supply = <&vdd_hdmi_pll>;
53
+
5154 			nvidia,dpaux = <&dpaux>;
5255 			nvidia,panel = <&panel>;
5356 		};
....@@ -370,7 +373,7 @@
370373 		spi-max-frequency = <25000000>;
371374 
372375 		flash@0 {
373
-			compatible = "winbond,w25q32dw";
376
+			compatible = "winbond,w25q32dw", "jedec,spi-nor";
374377 			spi-max-frequency = <25000000>;
375378 			reg = <0>;
376379 		};
....@@ -413,6 +416,11 @@
413416 
414417 	padctl@7009f000 {
415418 		status = "okay";
419
+
420
+		avdd-pll-utmip-supply = <&vddio_1v8>;
421
+		avdd-pll-erefe-supply = <&avdd_1v05_run>;
422
+		avdd-pex-pll-supply = <&vdd_1v05_run>;
423
+		hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
416424 
417425 		pads {
418426 			usb2 {
....@@ -490,7 +498,7 @@
490498 		reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
491499 	};
492500 
493
-	sdhci@700b0000 { /* WiFi/BT on this bus */
501
+	mmc@700b0000 { /* WiFi/BT on this bus */
494502 		status = "okay";
495503 		bus-width = <4>;
496504 		no-1-8-v;
....@@ -501,7 +509,7 @@
501509 		keep-power-in-suspend;
502510 	};
503511 
504
-	sdhci@700b0400 { /* SD Card on this bus */
512
+	mmc@700b0400 { /* SD Card on this bus */
505513 		status = "okay";
506514 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
507515 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
....@@ -510,7 +518,7 @@
510518 		vqmmc-supply = <&vddio_sdmmc3>;
511519 	};
512520 
513
-	sdhci@700b0600 { /* eMMC on this bus */
521
+	mmc@700b0600 { /* eMMC on this bus */
514522 		status = "okay";
515523 		bus-width = <8>;
516524 		no-1-8-v;
....@@ -574,17 +582,10 @@
574582 			 256>;
575583 	};
576584 
577
-	clocks {
578
-		compatible = "simple-bus";
579
-		#address-cells = <1>;
580
-		#size-cells = <0>;
581
-
582
-		clk32k_in: clock@0 {
583
-			compatible = "fixed-clock";
584
-			reg = <0>;
585
-			#clock-cells = <0>;
586
-			clock-frequency = <32768>;
587
-		};
585
+	clk32k_in: clock@0 {
586
+		compatible = "fixed-clock";
587
+		clock-frequency = <32768>;
588
+		#clock-cells = <0>;
588589 	};
589590 
590591 	cpus {
....@@ -614,157 +615,138 @@
614615 		};
615616 	};
616617 
617
-	regulators {
618
-		compatible = "simple-bus";
619
-		#address-cells = <1>;
620
-		#size-cells = <0>;
618
+	vdd_mux: regulator@0 {
619
+		compatible = "regulator-fixed";
620
+		regulator-name = "+VDD_MUX";
621
+		regulator-min-microvolt = <12000000>;
622
+		regulator-max-microvolt = <12000000>;
623
+		regulator-always-on;
624
+		regulator-boot-on;
625
+	};
621626 
622
-		vdd_mux: regulator@0 {
623
-			compatible = "regulator-fixed";
624
-			reg = <0>;
625
-			regulator-name = "+VDD_MUX";
626
-			regulator-min-microvolt = <12000000>;
627
-			regulator-max-microvolt = <12000000>;
628
-			regulator-always-on;
629
-			regulator-boot-on;
630
-		};
627
+	vdd_5v0_sys: regulator@1 {
628
+		compatible = "regulator-fixed";
629
+		regulator-name = "+5V_SYS";
630
+		regulator-min-microvolt = <5000000>;
631
+		regulator-max-microvolt = <5000000>;
632
+		regulator-always-on;
633
+		regulator-boot-on;
634
+		vin-supply = <&vdd_mux>;
635
+	};
631636 
632
-		vdd_5v0_sys: regulator@1 {
633
-			compatible = "regulator-fixed";
634
-			reg = <1>;
635
-			regulator-name = "+5V_SYS";
636
-			regulator-min-microvolt = <5000000>;
637
-			regulator-max-microvolt = <5000000>;
638
-			regulator-always-on;
639
-			regulator-boot-on;
640
-			vin-supply = <&vdd_mux>;
641
-		};
637
+	vdd_3v3_sys: regulator@2 {
638
+		compatible = "regulator-fixed";
639
+		regulator-name = "+3.3V_SYS";
640
+		regulator-min-microvolt = <3300000>;
641
+		regulator-max-microvolt = <3300000>;
642
+		regulator-always-on;
643
+		regulator-boot-on;
644
+		vin-supply = <&vdd_mux>;
645
+	};
642646 
643
-		vdd_3v3_sys: regulator@2 {
644
-			compatible = "regulator-fixed";
645
-			reg = <2>;
646
-			regulator-name = "+3.3V_SYS";
647
-			regulator-min-microvolt = <3300000>;
648
-			regulator-max-microvolt = <3300000>;
649
-			regulator-always-on;
650
-			regulator-boot-on;
651
-			vin-supply = <&vdd_mux>;
652
-		};
647
+	vdd_3v3_run: regulator@3 {
648
+		compatible = "regulator-fixed";
649
+		regulator-name = "+3.3V_RUN";
650
+		regulator-min-microvolt = <3300000>;
651
+		regulator-max-microvolt = <3300000>;
652
+		regulator-always-on;
653
+		regulator-boot-on;
654
+		gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
655
+		enable-active-high;
656
+		vin-supply = <&vdd_3v3_sys>;
657
+	};
653658 
654
-		vdd_3v3_run: regulator@3 {
655
-			compatible = "regulator-fixed";
656
-			reg = <3>;
657
-			regulator-name = "+3.3V_RUN";
658
-			regulator-min-microvolt = <3300000>;
659
-			regulator-max-microvolt = <3300000>;
660
-			regulator-always-on;
661
-			regulator-boot-on;
662
-			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
663
-			enable-active-high;
664
-			vin-supply = <&vdd_3v3_sys>;
665
-		};
659
+	vdd_3v3_hdmi: regulator@4 {
660
+		compatible = "regulator-fixed";
661
+		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
662
+		regulator-min-microvolt = <3300000>;
663
+		regulator-max-microvolt = <3300000>;
664
+		vin-supply = <&vdd_3v3_run>;
665
+	};
666666 
667
-		vdd_3v3_hdmi: regulator@4 {
668
-			compatible = "regulator-fixed";
669
-			reg = <4>;
670
-			regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
671
-			regulator-min-microvolt = <3300000>;
672
-			regulator-max-microvolt = <3300000>;
673
-			vin-supply = <&vdd_3v3_run>;
674
-		};
667
+	vdd_led: regulator@5 {
668
+		compatible = "regulator-fixed";
669
+		regulator-name = "+VDD_LED";
670
+		gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
671
+		enable-active-high;
672
+		vin-supply = <&vdd_mux>;
673
+	};
675674 
676
-		vdd_led: regulator@5 {
677
-			compatible = "regulator-fixed";
678
-			reg = <5>;
679
-			regulator-name = "+VDD_LED";
680
-			gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
681
-			enable-active-high;
682
-			vin-supply = <&vdd_mux>;
683
-		};
675
+	vdd_5v0_ts: regulator@6 {
676
+		compatible = "regulator-fixed";
677
+		regulator-name = "+5V_VDD_TS_SW";
678
+		regulator-min-microvolt = <5000000>;
679
+		regulator-max-microvolt = <5000000>;
680
+		regulator-boot-on;
681
+		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
682
+		enable-active-high;
683
+		vin-supply = <&vdd_5v0_sys>;
684
+	};
684685 
685
-		vdd_5v0_ts: regulator@6 {
686
-			compatible = "regulator-fixed";
687
-			reg = <6>;
688
-			regulator-name = "+5V_VDD_TS_SW";
689
-			regulator-min-microvolt = <5000000>;
690
-			regulator-max-microvolt = <5000000>;
691
-			regulator-boot-on;
692
-			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
693
-			enable-active-high;
694
-			vin-supply = <&vdd_5v0_sys>;
695
-		};
686
+	vdd_usb1_vbus: regulator@7 {
687
+		compatible = "regulator-fixed";
688
+		regulator-name = "+5V_USB_HS";
689
+		regulator-min-microvolt = <5000000>;
690
+		regulator-max-microvolt = <5000000>;
691
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
692
+		enable-active-high;
693
+		gpio-open-drain;
694
+		vin-supply = <&vdd_5v0_sys>;
695
+	};
696696 
697
-		vdd_usb1_vbus: regulator@7 {
698
-			compatible = "regulator-fixed";
699
-			reg = <7>;
700
-			regulator-name = "+5V_USB_HS";
701
-			regulator-min-microvolt = <5000000>;
702
-			regulator-max-microvolt = <5000000>;
703
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
704
-			enable-active-high;
705
-			gpio-open-drain;
706
-			vin-supply = <&vdd_5v0_sys>;
707
-		};
697
+	vdd_usb3_vbus: regulator@8 {
698
+		compatible = "regulator-fixed";
699
+		regulator-name = "+5V_USB_SS";
700
+		regulator-min-microvolt = <5000000>;
701
+		regulator-max-microvolt = <5000000>;
702
+		gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
703
+		enable-active-high;
704
+		gpio-open-drain;
705
+		vin-supply = <&vdd_5v0_sys>;
706
+	};
708707 
709
-		vdd_usb3_vbus: regulator@8 {
710
-			compatible = "regulator-fixed";
711
-			reg = <8>;
712
-			regulator-name = "+5V_USB_SS";
713
-			regulator-min-microvolt = <5000000>;
714
-			regulator-max-microvolt = <5000000>;
715
-			gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
716
-			enable-active-high;
717
-			gpio-open-drain;
718
-			vin-supply = <&vdd_5v0_sys>;
719
-		};
708
+	vdd_3v3_panel: regulator@9 {
709
+		compatible = "regulator-fixed";
710
+		regulator-name = "+3.3V_PANEL";
711
+		regulator-min-microvolt = <3300000>;
712
+		regulator-max-microvolt = <3300000>;
713
+		gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
714
+		enable-active-high;
715
+		vin-supply = <&vdd_3v3_run>;
716
+	};
720717 
721
-		vdd_3v3_panel: regulator@9 {
722
-			compatible = "regulator-fixed";
723
-			reg = <9>;
724
-			regulator-name = "+3.3V_PANEL";
725
-			regulator-min-microvolt = <3300000>;
726
-			regulator-max-microvolt = <3300000>;
727
-			gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
728
-			enable-active-high;
729
-			vin-supply = <&vdd_3v3_run>;
730
-		};
718
+	vdd_3v3_lp0: regulator@10 {
719
+		compatible = "regulator-fixed";
720
+		regulator-name = "+3.3V_LP0";
721
+		regulator-min-microvolt = <3300000>;
722
+		regulator-max-microvolt = <3300000>;
723
+		/*
724
+		 * TODO: find a way to wire this up with the USB EHCI
725
+		 * controllers so that it can be enabled on demand.
726
+		 */
727
+		regulator-always-on;
728
+		gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
729
+		enable-active-high;
730
+		vin-supply = <&vdd_3v3_sys>;
731
+	};
731732 
732
-		vdd_3v3_lp0: regulator@10 {
733
-			compatible = "regulator-fixed";
734
-			reg = <10>;
735
-			regulator-name = "+3.3V_LP0";
736
-			regulator-min-microvolt = <3300000>;
737
-			regulator-max-microvolt = <3300000>;
738
-			/*
739
-			 * TODO: find a way to wire this up with the USB EHCI
740
-			 * controllers so that it can be enabled on demand.
741
-			 */
742
-			regulator-always-on;
743
-			gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
744
-			enable-active-high;
745
-			vin-supply = <&vdd_3v3_sys>;
746
-		};
733
+	vdd_hdmi_pll: regulator@11 {
734
+		compatible = "regulator-fixed";
735
+		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
736
+		regulator-min-microvolt = <1050000>;
737
+		regulator-max-microvolt = <1050000>;
738
+		gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
739
+		vin-supply = <&vdd_1v05_run>;
740
+	};
747741 
748
-		vdd_hdmi_pll: regulator@11 {
749
-			compatible = "regulator-fixed";
750
-			reg = <11>;
751
-			regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
752
-			regulator-min-microvolt = <1050000>;
753
-			regulator-max-microvolt = <1050000>;
754
-			gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
755
-			vin-supply = <&vdd_1v05_run>;
756
-		};
757
-
758
-		vdd_5v0_hdmi: regulator@12 {
759
-			compatible = "regulator-fixed";
760
-			reg = <12>;
761
-			regulator-name = "+5V_HDMI_CON";
762
-			regulator-min-microvolt = <5000000>;
763
-			regulator-max-microvolt = <5000000>;
764
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
765
-			enable-active-high;
766
-			vin-supply = <&vdd_5v0_sys>;
767
-		};
742
+	vdd_5v0_hdmi: regulator@12 {
743
+		compatible = "regulator-fixed";
744
+		regulator-name = "+5V_HDMI_CON";
745
+		regulator-min-microvolt = <5000000>;
746
+		regulator-max-microvolt = <5000000>;
747
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
748
+		enable-active-high;
749
+		vin-supply = <&vdd_5v0_sys>;
768750 	};
769751 
770752 	sound {
....@@ -783,9 +765,15 @@
783765 
784766 		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
785767 			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
786
-			 <&tegra_car TEGRA124_CLK_EXTERN1>;
768
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
787769 		clock-names = "pll_a", "pll_a_out0", "mclk";
788770 
771
+		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
772
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
773
+
774
+		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
775
+					 <&tegra_car TEGRA124_CLK_EXTERN1>;
776
+
789777 		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>;
790778 		nvidia,mic-det-gpios =
791779 				<&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;