forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/arch/arm/boot/dts/tegra124-jetson-tk1.dts
....@@ -1656,7 +1656,7 @@
16561656 		status = "okay";
16571657 		spi-max-frequency = <25000000>;
16581658 		spi-flash@0 {
1659
-			compatible = "winbond,w25q32dw";
1659
+			compatible = "winbond,w25q32dw", "jedec,spi-nor";
16601660 			reg = <0>;
16611661 			spi-max-frequency = <20000000>;
16621662 		};
....@@ -1721,6 +1721,11 @@
17211721 	padctl@7009f000 {
17221722 		status = "okay";
17231723 
1724
+		avdd-pll-utmip-supply = <&vddio_1v8>;
1725
+		avdd-pll-erefe-supply = <&avdd_1v05_run>;
1726
+		avdd-pex-pll-supply = <&vdd_1v05_run>;
1727
+		hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
1728
+
17241729 		pads {
17251730 			usb2 {
17261731 				status = "okay";
....@@ -1780,7 +1785,7 @@
17801785 			/* Micro A/B */
17811786 			usb2-0 {
17821787 				status = "okay";
1783
-				mode = "otg";
1788
+				mode = "host";
17841789 			};
17851790 
17861791 			/* Mini PCIe */
....@@ -1805,7 +1810,7 @@
18051810 	};
18061811 
18071812 	/* SD card */
1808
-	sdhci@700b0400 {
1813
+	mmc@700b0400 {
18091814 		status = "okay";
18101815 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
18111816 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
....@@ -1815,7 +1820,7 @@
18151820 	};
18161821 
18171822 	/* eMMC */
1818
-	sdhci@700b0600 {
1823
+	mmc@700b0600 {
18191824 		status = "okay";
18201825 		bus-width = <8>;
18211826 		non-removable;
....@@ -1863,17 +1868,10 @@
18631868 		vbus-supply = <&vdd_usb3_vbus>;
18641869 	};
18651870 
1866
-	clocks {
1867
-		compatible = "simple-bus";
1868
-		#address-cells = <1>;
1869
-		#size-cells = <0>;
1870
-
1871
-		clk32k_in: clock@0 {
1872
-			compatible = "fixed-clock";
1873
-			reg = <0>;
1874
-			#clock-cells = <0>;
1875
-			clock-frequency = <32768>;
1876
-		};
1871
+	clk32k_in: clock@0 {
1872
+		compatible = "fixed-clock";
1873
+		clock-frequency = <32768>;
1874
+		#clock-cells = <0>;
18771875 	};
18781876 
18791877 	cpus {
....@@ -1894,145 +1892,127 @@
18941892 		};
18951893 	};
18961894 
1897
-	regulators {
1898
-		compatible = "simple-bus";
1899
-		#address-cells = <1>;
1900
-		#size-cells = <0>;
1895
+	vdd_mux: regulator@0 {
1896
+		compatible = "regulator-fixed";
1897
+		regulator-name = "+VDD_MUX";
1898
+		regulator-min-microvolt = <12000000>;
1899
+		regulator-max-microvolt = <12000000>;
1900
+		regulator-always-on;
1901
+		regulator-boot-on;
1902
+	};
19011903 
1902
-		vdd_mux: regulator@0 {
1903
-			compatible = "regulator-fixed";
1904
-			reg = <0>;
1905
-			regulator-name = "+VDD_MUX";
1906
-			regulator-min-microvolt = <12000000>;
1907
-			regulator-max-microvolt = <12000000>;
1908
-			regulator-always-on;
1909
-			regulator-boot-on;
1910
-		};
1904
+	vdd_5v0_sys: regulator@1 {
1905
+		compatible = "regulator-fixed";
1906
+		regulator-name = "+5V_SYS";
1907
+		regulator-min-microvolt = <5000000>;
1908
+		regulator-max-microvolt = <5000000>;
1909
+		regulator-always-on;
1910
+		regulator-boot-on;
1911
+		vin-supply = <&vdd_mux>;
1912
+	};
19111913 
1912
-		vdd_5v0_sys: regulator@1 {
1913
-			compatible = "regulator-fixed";
1914
-			reg = <1>;
1915
-			regulator-name = "+5V_SYS";
1916
-			regulator-min-microvolt = <5000000>;
1917
-			regulator-max-microvolt = <5000000>;
1918
-			regulator-always-on;
1919
-			regulator-boot-on;
1920
-			vin-supply = <&vdd_mux>;
1921
-		};
1914
+	vdd_3v3_sys: regulator@2 {
1915
+		compatible = "regulator-fixed";
1916
+		regulator-name = "+3.3V_SYS";
1917
+		regulator-min-microvolt = <3300000>;
1918
+		regulator-max-microvolt = <3300000>;
1919
+		regulator-always-on;
1920
+		regulator-boot-on;
1921
+		vin-supply = <&vdd_mux>;
1922
+	};
19221923 
1923
-		vdd_3v3_sys: regulator@2 {
1924
-			compatible = "regulator-fixed";
1925
-			reg = <2>;
1926
-			regulator-name = "+3.3V_SYS";
1927
-			regulator-min-microvolt = <3300000>;
1928
-			regulator-max-microvolt = <3300000>;
1929
-			regulator-always-on;
1930
-			regulator-boot-on;
1931
-			vin-supply = <&vdd_mux>;
1932
-		};
1924
+	vdd_3v3_run: regulator@3 {
1925
+		compatible = "regulator-fixed";
1926
+		regulator-name = "+3.3V_RUN";
1927
+		regulator-min-microvolt = <3300000>;
1928
+		regulator-max-microvolt = <3300000>;
1929
+		regulator-always-on;
1930
+		regulator-boot-on;
1931
+		gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
1932
+		enable-active-high;
1933
+		vin-supply = <&vdd_3v3_sys>;
1934
+	};
19331935 
1934
-		vdd_3v3_run: regulator@3 {
1935
-			compatible = "regulator-fixed";
1936
-			reg = <3>;
1937
-			regulator-name = "+3.3V_RUN";
1938
-			regulator-min-microvolt = <3300000>;
1939
-			regulator-max-microvolt = <3300000>;
1940
-			regulator-always-on;
1941
-			regulator-boot-on;
1942
-			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
1943
-			enable-active-high;
1944
-			vin-supply = <&vdd_3v3_sys>;
1945
-		};
1936
+	vdd_3v3_hdmi: regulator@4 {
1937
+		compatible = "regulator-fixed";
1938
+		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
1939
+		regulator-min-microvolt = <3300000>;
1940
+		regulator-max-microvolt = <3300000>;
1941
+		vin-supply = <&vdd_3v3_run>;
1942
+	};
19461943 
1947
-		vdd_3v3_hdmi: regulator@4 {
1948
-			compatible = "regulator-fixed";
1949
-			reg = <4>;
1950
-			regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
1951
-			regulator-min-microvolt = <3300000>;
1952
-			regulator-max-microvolt = <3300000>;
1953
-			vin-supply = <&vdd_3v3_run>;
1954
-		};
1944
+	vdd_usb1_vbus: regulator@5 {
1945
+		compatible = "regulator-fixed";
1946
+		regulator-name = "+USB0_VBUS_SW";
1947
+		regulator-min-microvolt = <5000000>;
1948
+		regulator-max-microvolt = <5000000>;
1949
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1950
+		enable-active-high;
1951
+		gpio-open-drain;
1952
+		vin-supply = <&vdd_5v0_sys>;
1953
+	};
19551954 
1956
-		vdd_usb1_vbus: regulator@7 {
1957
-			compatible = "regulator-fixed";
1958
-			reg = <7>;
1959
-			regulator-name = "+USB0_VBUS_SW";
1960
-			regulator-min-microvolt = <5000000>;
1961
-			regulator-max-microvolt = <5000000>;
1962
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1963
-			enable-active-high;
1964
-			gpio-open-drain;
1965
-			vin-supply = <&vdd_5v0_sys>;
1966
-		};
1955
+	vdd_usb3_vbus: regulator@6 {
1956
+		compatible = "regulator-fixed";
1957
+		regulator-name = "+5V_USB_HS";
1958
+		regulator-min-microvolt = <5000000>;
1959
+		regulator-max-microvolt = <5000000>;
1960
+		gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
1961
+		enable-active-high;
1962
+		gpio-open-drain;
1963
+		vin-supply = <&vdd_5v0_sys>;
1964
+	};
19671965 
1968
-		vdd_usb3_vbus: regulator@8 {
1969
-			compatible = "regulator-fixed";
1970
-			reg = <8>;
1971
-			regulator-name = "+5V_USB_HS";
1972
-			regulator-min-microvolt = <5000000>;
1973
-			regulator-max-microvolt = <5000000>;
1974
-			gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
1975
-			enable-active-high;
1976
-			gpio-open-drain;
1977
-			vin-supply = <&vdd_5v0_sys>;
1978
-		};
1966
+	vdd_3v3_lp0: regulator@7 {
1967
+		compatible = "regulator-fixed";
1968
+		regulator-name = "+3.3V_LP0";
1969
+		regulator-min-microvolt = <3300000>;
1970
+		regulator-max-microvolt = <3300000>;
1971
+		regulator-always-on;
1972
+		regulator-boot-on;
1973
+		gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
1974
+		enable-active-high;
1975
+		vin-supply = <&vdd_3v3_sys>;
1976
+	};
19791977 
1980
-		vdd_3v3_lp0: regulator@10 {
1981
-			compatible = "regulator-fixed";
1982
-			reg = <10>;
1983
-			regulator-name = "+3.3V_LP0";
1984
-			regulator-min-microvolt = <3300000>;
1985
-			regulator-max-microvolt = <3300000>;
1986
-			regulator-always-on;
1987
-			regulator-boot-on;
1988
-			gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
1989
-			enable-active-high;
1990
-			vin-supply = <&vdd_3v3_sys>;
1991
-		};
1978
+	vdd_hdmi_pll: regulator@8 {
1979
+		compatible = "regulator-fixed";
1980
+		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
1981
+		regulator-min-microvolt = <1050000>;
1982
+		regulator-max-microvolt = <1050000>;
1983
+		gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
1984
+		vin-supply = <&vdd_1v05_run>;
1985
+	};
19921986 
1993
-		vdd_hdmi_pll: regulator@11 {
1994
-			compatible = "regulator-fixed";
1995
-			reg = <11>;
1996
-			regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
1997
-			regulator-min-microvolt = <1050000>;
1998
-			regulator-max-microvolt = <1050000>;
1999
-			gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
2000
-			vin-supply = <&vdd_1v05_run>;
2001
-		};
1987
+	vdd_5v0_hdmi: regulator@9 {
1988
+		compatible = "regulator-fixed";
1989
+		regulator-name = "+5V_HDMI_CON";
1990
+		regulator-min-microvolt = <5000000>;
1991
+		regulator-max-microvolt = <5000000>;
1992
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
1993
+		enable-active-high;
1994
+		vin-supply = <&vdd_5v0_sys>;
1995
+	};
20021996 
2003
-		vdd_5v0_hdmi: regulator@12 {
2004
-			compatible = "regulator-fixed";
2005
-			reg = <12>;
2006
-			regulator-name = "+5V_HDMI_CON";
2007
-			regulator-min-microvolt = <5000000>;
2008
-			regulator-max-microvolt = <5000000>;
2009
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
2010
-			enable-active-high;
2011
-			vin-supply = <&vdd_5v0_sys>;
2012
-		};
1997
+	/* Molex power connector */
1998
+	vdd_5v0_sata: regulator@10 {
1999
+		compatible = "regulator-fixed";
2000
+		regulator-name = "+5V_SATA";
2001
+		regulator-min-microvolt = <5000000>;
2002
+		regulator-max-microvolt = <5000000>;
2003
+		gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
2004
+		enable-active-high;
2005
+		vin-supply = <&vdd_5v0_sys>;
2006
+	};
20132007 
2014
-		/* Molex power connector */
2015
-		vdd_5v0_sata: regulator@13 {
2016
-			compatible = "regulator-fixed";
2017
-			reg = <13>;
2018
-			regulator-name = "+5V_SATA";
2019
-			regulator-min-microvolt = <5000000>;
2020
-			regulator-max-microvolt = <5000000>;
2021
-			gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
2022
-			enable-active-high;
2023
-			vin-supply = <&vdd_5v0_sys>;
2024
-		};
2025
-
2026
-		vdd_12v0_sata: regulator@14 {
2027
-			compatible = "regulator-fixed";
2028
-			reg = <14>;
2029
-			regulator-name = "+12V_SATA";
2030
-			regulator-min-microvolt = <12000000>;
2031
-			regulator-max-microvolt = <12000000>;
2032
-			gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
2033
-			enable-active-high;
2034
-			vin-supply = <&vdd_mux>;
2035
-		};
2008
+	vdd_12v0_sata: regulator@11 {
2009
+		compatible = "regulator-fixed";
2010
+		regulator-name = "+12V_SATA";
2011
+		regulator-min-microvolt = <12000000>;
2012
+		regulator-max-microvolt = <12000000>;
2013
+		gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
2014
+		enable-active-high;
2015
+		vin-supply = <&vdd_mux>;
20362016 	};
20372017 
20382018 	sound {
....@@ -2053,8 +2033,14 @@
20532033 
20542034 		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
20552035 			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
2056
-			 <&tegra_car TEGRA124_CLK_EXTERN1>;
2036
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
20572037 		clock-names = "pll_a", "pll_a_out0", "mclk";
2038
+
2039
+		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
2040
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
2041
+
2042
+		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
2043
+					 <&tegra_car TEGRA124_CLK_EXTERN1>;
20582044 	};
20592045 
20602046 	thermal-zones {