forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/arch/arm/boot/dts/tegra30-beaver.dts
....@@ -2,6 +2,8 @@
22 /dts-v1/;
33 
44 #include "tegra30.dtsi"
5
+#include "tegra30-cpu-opp.dtsi"
6
+#include "tegra30-cpu-opp-microvolt.dtsi"
57 
68 / {
79 	model = "NVIDIA Tegra30 Beaver evaluation board";
....@@ -1806,9 +1808,14 @@
18061808 
18071809 				vddctrl_reg: vddctrl {
18081810 					regulator-name = "vdd_cpu,vdd_sys";
1809
-					regulator-min-microvolt = <1000000>;
1810
-					regulator-max-microvolt = <1000000>;
1811
+					regulator-min-microvolt = <800000>;
1812
+					regulator-max-microvolt = <1250000>;
1813
+					regulator-coupled-with = <&core_vdd_reg>;
1814
+					regulator-coupled-max-spread = <300000>;
1815
+					regulator-max-step-microvolt = <100000>;
18111816 					regulator-always-on;
1817
+
1818
+					nvidia,tegra-cpu-regulator;
18121819 				};
18131820 
18141821 				vio_reg: vio {
....@@ -1868,17 +1875,22 @@
18681875 			};
18691876 		};
18701877 
1871
-		tps62361@60 {
1878
+		core_vdd_reg: tps62361@60 {
18721879 			compatible = "ti,tps62361";
18731880 			reg = <0x60>;
18741881 
18751882 			regulator-name = "tps62361-vout";
18761883 			regulator-min-microvolt = <500000>;
18771884 			regulator-max-microvolt = <1500000>;
1885
+			regulator-coupled-with = <&vddctrl_reg>;
1886
+			regulator-coupled-max-spread = <300000>;
1887
+			regulator-max-step-microvolt = <100000>;
18781888 			regulator-boot-on;
18791889 			regulator-always-on;
18801890 			ti,vsel0-state-high;
18811891 			ti,vsel1-state-high;
1892
+
1893
+			nvidia,tegra-core-regulator;
18821894 		};
18831895 	};
18841896 
....@@ -1886,7 +1898,7 @@
18861898 		status = "okay";
18871899 		spi-max-frequency = <25000000>;
18881900 		spi-flash@1 {
1889
-			compatible = "winbond,w25q32";
1901
+			compatible = "winbond,w25q32", "jedec,spi-nor";
18901902 			reg = <1>;
18911903 			spi-max-frequency = <20000000>;
18921904 		};
....@@ -1910,7 +1922,7 @@
19101922 		};
19111923 	};
19121924 
1913
-	sdhci@78000000 {
1925
+	mmc@78000000 {
19141926 		status = "okay";
19151927 		vqmmc-supply = <&ldo5_reg>;
19161928 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
....@@ -1919,7 +1931,7 @@
19191931 		bus-width = <4>;
19201932 	};
19211933 
1922
-	sdhci@78000600 {
1934
+	mmc@78000600 {
19231935 		status = "okay";
19241936 		bus-width = <8>;
19251937 		non-removable;
....@@ -1953,17 +1965,10 @@
19531965 		status = "okay";
19541966 	};
19551967 
1956
-	clocks {
1957
-		compatible = "simple-bus";
1958
-		#address-cells = <1>;
1959
-		#size-cells = <0>;
1960
-
1961
-		clk32k_in: clock@0 {
1962
-			compatible = "fixed-clock";
1963
-			reg = <0>;
1964
-			#clock-cells = <0>;
1965
-			clock-frequency = <32768>;
1966
-		};
1968
+	clk32k_in: clock@0 {
1969
+		compatible = "fixed-clock";
1970
+		clock-frequency = <32768>;
1971
+		#clock-cells = <0>;
19671972 	};
19681973 
19691974 	gpio-leds {
....@@ -1979,118 +1984,103 @@
19791984 		};
19801985 	};
19811986 
1982
-	regulators {
1983
-		compatible = "simple-bus";
1984
-		#address-cells = <1>;
1985
-		#size-cells = <0>;
1987
+	vdd_5v_in_reg: regulator@0 {
1988
+		compatible = "regulator-fixed";
1989
+		regulator-name = "vdd_5v_in";
1990
+		regulator-min-microvolt = <5000000>;
1991
+		regulator-max-microvolt = <5000000>;
1992
+		regulator-always-on;
1993
+	};
19861994 
1987
-		vdd_5v_in_reg: regulator@0 {
1988
-			compatible = "regulator-fixed";
1989
-			reg = <0>;
1990
-			regulator-name = "vdd_5v_in";
1991
-			regulator-min-microvolt = <5000000>;
1992
-			regulator-max-microvolt = <5000000>;
1993
-			regulator-always-on;
1994
-		};
1995
+	chargepump_5v_reg: regulator@1 {
1996
+		compatible = "regulator-fixed";
1997
+		regulator-name = "chargepump_5v";
1998
+		regulator-min-microvolt = <5000000>;
1999
+		regulator-max-microvolt = <5000000>;
2000
+		regulator-boot-on;
2001
+		regulator-always-on;
2002
+		enable-active-high;
2003
+		gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
2004
+	};
19952005 
1996
-		chargepump_5v_reg: regulator@1 {
1997
-			compatible = "regulator-fixed";
1998
-			reg = <1>;
1999
-			regulator-name = "chargepump_5v";
2000
-			regulator-min-microvolt = <5000000>;
2001
-			regulator-max-microvolt = <5000000>;
2002
-			regulator-boot-on;
2003
-			regulator-always-on;
2004
-			enable-active-high;
2005
-			gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
2006
-		};
2006
+	ddr_reg: regulator@2 {
2007
+		compatible = "regulator-fixed";
2008
+		regulator-name = "vdd_ddr";
2009
+		regulator-min-microvolt = <1500000>;
2010
+		regulator-max-microvolt = <1500000>;
2011
+		regulator-always-on;
2012
+		regulator-boot-on;
2013
+		enable-active-high;
2014
+		gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
2015
+		vin-supply = <&vdd_5v_in_reg>;
2016
+	};
20072017 
2008
-		ddr_reg: regulator@2 {
2009
-			compatible = "regulator-fixed";
2010
-			reg = <2>;
2011
-			regulator-name = "vdd_ddr";
2012
-			regulator-min-microvolt = <1500000>;
2013
-			regulator-max-microvolt = <1500000>;
2014
-			regulator-always-on;
2015
-			regulator-boot-on;
2016
-			enable-active-high;
2017
-			gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
2018
-			vin-supply = <&vdd_5v_in_reg>;
2019
-		};
2018
+	vdd_5v_sata_reg: regulator@3 {
2019
+		compatible = "regulator-fixed";
2020
+		regulator-name = "vdd_5v_sata";
2021
+		regulator-min-microvolt = <5000000>;
2022
+		regulator-max-microvolt = <5000000>;
2023
+		regulator-always-on;
2024
+		regulator-boot-on;
2025
+		enable-active-high;
2026
+		gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
2027
+		vin-supply = <&vdd_5v_in_reg>;
2028
+	};
20202029 
2021
-		vdd_5v_sata_reg: regulator@3 {
2022
-			compatible = "regulator-fixed";
2023
-			reg = <3>;
2024
-			regulator-name = "vdd_5v_sata";
2025
-			regulator-min-microvolt = <5000000>;
2026
-			regulator-max-microvolt = <5000000>;
2027
-			regulator-always-on;
2028
-			regulator-boot-on;
2029
-			enable-active-high;
2030
-			gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
2031
-			vin-supply = <&vdd_5v_in_reg>;
2032
-		};
2030
+	usb1_vbus_reg: regulator@4 {
2031
+		compatible = "regulator-fixed";
2032
+		regulator-name = "usb1_vbus";
2033
+		regulator-min-microvolt = <5000000>;
2034
+		regulator-max-microvolt = <5000000>;
2035
+		enable-active-high;
2036
+		gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
2037
+		gpio-open-drain;
2038
+		vin-supply = <&vdd_5v_in_reg>;
2039
+	};
20332040 
2034
-		usb1_vbus_reg: regulator@4 {
2035
-			compatible = "regulator-fixed";
2036
-			reg = <4>;
2037
-			regulator-name = "usb1_vbus";
2038
-			regulator-min-microvolt = <5000000>;
2039
-			regulator-max-microvolt = <5000000>;
2040
-			enable-active-high;
2041
-			gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
2042
-			gpio-open-drain;
2043
-			vin-supply = <&vdd_5v_in_reg>;
2044
-		};
2041
+	usb3_vbus_reg: regulator@5 {
2042
+		compatible = "regulator-fixed";
2043
+		regulator-name = "usb3_vbus";
2044
+		regulator-min-microvolt = <5000000>;
2045
+		regulator-max-microvolt = <5000000>;
2046
+		enable-active-high;
2047
+		gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
2048
+		gpio-open-drain;
2049
+		vin-supply = <&vdd_5v_in_reg>;
2050
+	};
20452051 
2046
-		usb3_vbus_reg: regulator@5 {
2047
-			compatible = "regulator-fixed";
2048
-			reg = <5>;
2049
-			regulator-name = "usb3_vbus";
2050
-			regulator-min-microvolt = <5000000>;
2051
-			regulator-max-microvolt = <5000000>;
2052
-			enable-active-high;
2053
-			gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
2054
-			gpio-open-drain;
2055
-			vin-supply = <&vdd_5v_in_reg>;
2056
-		};
2052
+	sys_3v3_reg: regulator@6 {
2053
+		compatible = "regulator-fixed";
2054
+		regulator-name = "sys_3v3,vdd_3v3_alw";
2055
+		regulator-min-microvolt = <3300000>;
2056
+		regulator-max-microvolt = <3300000>;
2057
+		regulator-always-on;
2058
+		regulator-boot-on;
2059
+		enable-active-high;
2060
+		gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
2061
+		vin-supply = <&vdd_5v_in_reg>;
2062
+	};
20572063 
2058
-		sys_3v3_reg: regulator@6 {
2059
-			compatible = "regulator-fixed";
2060
-			reg = <6>;
2061
-			regulator-name = "sys_3v3,vdd_3v3_alw";
2062
-			regulator-min-microvolt = <3300000>;
2063
-			regulator-max-microvolt = <3300000>;
2064
-			regulator-always-on;
2065
-			regulator-boot-on;
2066
-			enable-active-high;
2067
-			gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
2068
-			vin-supply = <&vdd_5v_in_reg>;
2069
-		};
2064
+	sys_3v3_pexs_reg: regulator@7 {
2065
+		compatible = "regulator-fixed";
2066
+		regulator-name = "sys_3v3_pexs";
2067
+		regulator-min-microvolt = <3300000>;
2068
+		regulator-max-microvolt = <3300000>;
2069
+		regulator-always-on;
2070
+		regulator-boot-on;
2071
+		enable-active-high;
2072
+		gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
2073
+		vin-supply = <&sys_3v3_reg>;
2074
+	};
20702075 
2071
-		sys_3v3_pexs_reg: regulator@7 {
2072
-			compatible = "regulator-fixed";
2073
-			reg = <7>;
2074
-			regulator-name = "sys_3v3_pexs";
2075
-			regulator-min-microvolt = <3300000>;
2076
-			regulator-max-microvolt = <3300000>;
2077
-			regulator-always-on;
2078
-			regulator-boot-on;
2079
-			enable-active-high;
2080
-			gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
2081
-			vin-supply = <&sys_3v3_reg>;
2082
-		};
2083
-
2084
-		vdd_5v0_hdmi: regulator@8 {
2085
-			compatible = "regulator-fixed";
2086
-			reg = <8>;
2087
-			regulator-name = "+VDD_5V_HDMI";
2088
-			regulator-min-microvolt = <5000000>;
2089
-			regulator-max-microvolt = <5000000>;
2090
-			regulator-always-on;
2091
-			regulator-boot-on;
2092
-			vin-supply = <&sys_3v3_reg>;
2093
-		};
2076
+	vdd_5v0_hdmi: regulator@8 {
2077
+		compatible = "regulator-fixed";
2078
+		regulator-name = "+VDD_5V_HDMI";
2079
+		regulator-min-microvolt = <5000000>;
2080
+		regulator-max-microvolt = <5000000>;
2081
+		regulator-always-on;
2082
+		regulator-boot-on;
2083
+		vin-supply = <&sys_3v3_reg>;
20942084 	};
20952085 
20962086 	sound {
....@@ -2111,7 +2101,35 @@
21112101 
21122102 		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
21132103 			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
2114
-			 <&tegra_car TEGRA30_CLK_EXTERN1>;
2104
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
21152105 		clock-names = "pll_a", "pll_a_out0", "mclk";
2106
+
2107
+		assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
2108
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
2109
+
2110
+		assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
2111
+					 <&tegra_car TEGRA30_CLK_EXTERN1>;
2112
+	};
2113
+
2114
+	cpus {
2115
+		cpu0: cpu@0 {
2116
+			cpu-supply = <&vddctrl_reg>;
2117
+			operating-points-v2 = <&cpu0_opp_table>;
2118
+		};
2119
+
2120
+		cpu@1 {
2121
+			cpu-supply = <&vddctrl_reg>;
2122
+			operating-points-v2 = <&cpu0_opp_table>;
2123
+		};
2124
+
2125
+		cpu@2 {
2126
+			cpu-supply = <&vddctrl_reg>;
2127
+			operating-points-v2 = <&cpu0_opp_table>;
2128
+		};
2129
+
2130
+		cpu@3 {
2131
+			cpu-supply = <&vddctrl_reg>;
2132
+			operating-points-v2 = <&cpu0_opp_table>;
2133
+		};
21162134 	};
21172135 };