forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-16 50a212ec906f7524620675f0c57357691c26c81f 
 kernel/arch/arm/boot/dts/tegra124-venice2.dts
....@@ -38,6 +38,9 @@
3838 		sor@54540000 {
3939 			status = "okay";
4040 
41
+			avdd-io-hdmi-dp-supply = <&vdd_1v05_run>;
42
+			vdd-hdmi-dp-pll-supply = <&vdd_3v3_run>;
43
+
4144 			nvidia,dpaux = <&dpaux>;
4245 			nvidia,panel = <&panel>;
4346 		};
....@@ -45,6 +48,13 @@
4548 		dpaux@545c0000 {
4649 			vdd-supply = <&vdd_3v3_panel>;
4750 			status = "okay";
51
+
52
+			aux-bus {
53
+				panel: panel {
54
+					compatible = "lg,lp129qe";
55
+					backlight = <&backlight>;
56
+				};
57
+			};
4858 		};
4959 	};
5060 
....@@ -879,7 +889,7 @@
879889 		status = "okay";
880890 		spi-max-frequency = <25000000>;
881891 		spi-flash@0 {
882
-			compatible = "winbond,w25q32dw";
892
+			compatible = "winbond,w25q32dw", "jedec,spi-nor";
883893 			reg = <0>;
884894 			spi-max-frequency = <20000000>;
885895 		};
....@@ -921,6 +931,11 @@
921931 	};
922932 
923933 	padctl@7009f000 {
934
+		avdd-pll-utmip-supply = <&vddio_1v8>;
935
+		avdd-pll-erefe-supply = <&avdd_1v05_run>;
936
+		avdd-pex-pll-supply = <&vdd_1v05_run>;
937
+		hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
938
+
924939 		pads {
925940 			usb2 {
926941 				status = "okay";
....@@ -994,7 +1009,7 @@
9941009 		};
9951010 	};
9961011 
997
-	sdhci@700b0400 {
1012
+	mmc@700b0400 {
9981013 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
9991014 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
10001015 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
....@@ -1003,7 +1018,7 @@
10031018 		vqmmc-supply = <&vddio_sdmmc3>;
10041019 	};
10051020 
1006
-	sdhci@700b0600 {
1021
+	mmc@700b0600 {
10071022 		status = "okay";
10081023 		bus-width = <8>;
10091024 		non-removable;
....@@ -1053,17 +1068,10 @@
10531068 		default-brightness-level = <6>;
10541069 	};
10551070 
1056
-	clocks {
1057
-		compatible = "simple-bus";
1058
-		#address-cells = <1>;
1059
-		#size-cells = <0>;
1060
-
1061
-		clk32k_in: clock@0 {
1062
-			compatible = "fixed-clock";
1063
-			reg = <0>;
1064
-			#clock-cells = <0>;
1065
-			clock-frequency = <32768>;
1066
-		};
1071
+	clk32k_in: clock@0 {
1072
+		compatible = "fixed-clock";
1073
+		clock-frequency = <32768>;
1074
+		#clock-cells = <0>;
10671075 	};
10681076 
10691077 	gpio-keys {
....@@ -1078,166 +1086,140 @@
10781086 		};
10791087 	};
10801088 
1081
-	panel: panel {
1082
-		compatible = "lg,lp129qe", "simple-panel";
1083
-
1084
-		backlight = <&backlight>;
1085
-		ddc-i2c-bus = <&dpaux>;
1089
+	vdd_mux: regulator@0 {
1090
+		compatible = "regulator-fixed";
1091
+		regulator-name = "+VDD_MUX";
1092
+		regulator-min-microvolt = <12000000>;
1093
+		regulator-max-microvolt = <12000000>;
1094
+		regulator-always-on;
1095
+		regulator-boot-on;
10861096 	};
10871097 
1088
-	regulators {
1089
-		compatible = "simple-bus";
1090
-		#address-cells = <1>;
1091
-		#size-cells = <0>;
1098
+	vdd_5v0_sys: regulator@1 {
1099
+		compatible = "regulator-fixed";
1100
+		regulator-name = "+5V_SYS";
1101
+		regulator-min-microvolt = <5000000>;
1102
+		regulator-max-microvolt = <5000000>;
1103
+		regulator-always-on;
1104
+		regulator-boot-on;
1105
+		vin-supply = <&vdd_mux>;
1106
+	};
10921107 
1093
-		vdd_mux: regulator@0 {
1094
-			compatible = "regulator-fixed";
1095
-			reg = <0>;
1096
-			regulator-name = "+VDD_MUX";
1097
-			regulator-min-microvolt = <12000000>;
1098
-			regulator-max-microvolt = <12000000>;
1099
-			regulator-always-on;
1100
-			regulator-boot-on;
1101
-		};
1108
+	vdd_3v3_sys: regulator@2 {
1109
+		compatible = "regulator-fixed";
1110
+		regulator-name = "+3.3V_SYS";
1111
+		regulator-min-microvolt = <3300000>;
1112
+		regulator-max-microvolt = <3300000>;
1113
+		regulator-always-on;
1114
+		regulator-boot-on;
1115
+		vin-supply = <&vdd_mux>;
1116
+	};
11021117 
1103
-		vdd_5v0_sys: regulator@1 {
1104
-			compatible = "regulator-fixed";
1105
-			reg = <1>;
1106
-			regulator-name = "+5V_SYS";
1107
-			regulator-min-microvolt = <5000000>;
1108
-			regulator-max-microvolt = <5000000>;
1109
-			regulator-always-on;
1110
-			regulator-boot-on;
1111
-			vin-supply = <&vdd_mux>;
1112
-		};
1118
+	vdd_3v3_run: regulator@3 {
1119
+		compatible = "regulator-fixed";
1120
+		regulator-name = "+3.3V_RUN";
1121
+		regulator-min-microvolt = <3300000>;
1122
+		regulator-max-microvolt = <3300000>;
1123
+		regulator-always-on;
1124
+		regulator-boot-on;
1125
+		gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
1126
+		enable-active-high;
1127
+		vin-supply = <&vdd_3v3_sys>;
1128
+	};
11131129 
1114
-		vdd_3v3_sys: regulator@2 {
1115
-			compatible = "regulator-fixed";
1116
-			reg = <2>;
1117
-			regulator-name = "+3.3V_SYS";
1118
-			regulator-min-microvolt = <3300000>;
1119
-			regulator-max-microvolt = <3300000>;
1120
-			regulator-always-on;
1121
-			regulator-boot-on;
1122
-			vin-supply = <&vdd_mux>;
1123
-		};
1130
+	vdd_3v3_hdmi: regulator@4 {
1131
+		compatible = "regulator-fixed";
1132
+		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
1133
+		regulator-min-microvolt = <3300000>;
1134
+		regulator-max-microvolt = <3300000>;
1135
+		vin-supply = <&vdd_3v3_run>;
1136
+	};
11241137 
1125
-		vdd_3v3_run: regulator@3 {
1126
-			compatible = "regulator-fixed";
1127
-			reg = <3>;
1128
-			regulator-name = "+3.3V_RUN";
1129
-			regulator-min-microvolt = <3300000>;
1130
-			regulator-max-microvolt = <3300000>;
1131
-			regulator-always-on;
1132
-			regulator-boot-on;
1133
-			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
1134
-			enable-active-high;
1135
-			vin-supply = <&vdd_3v3_sys>;
1136
-		};
1138
+	vdd_led: regulator@5 {
1139
+		compatible = "regulator-fixed";
1140
+		regulator-name = "+VDD_LED";
1141
+		regulator-min-microvolt = <3300000>;
1142
+		regulator-max-microvolt = <3300000>;
1143
+		gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
1144
+		enable-active-high;
1145
+		vin-supply = <&vdd_mux>;
1146
+	};
11371147 
1138
-		vdd_3v3_hdmi: regulator@4 {
1139
-			compatible = "regulator-fixed";
1140
-			reg = <4>;
1141
-			regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
1142
-			regulator-min-microvolt = <3300000>;
1143
-			regulator-max-microvolt = <3300000>;
1144
-			vin-supply = <&vdd_3v3_run>;
1145
-		};
1148
+	vdd_5v0_ts: regulator@6 {
1149
+		compatible = "regulator-fixed";
1150
+		regulator-name = "+5V_VDD_TS_SW";
1151
+		regulator-min-microvolt = <5000000>;
1152
+		regulator-max-microvolt = <5000000>;
1153
+		regulator-boot-on;
1154
+		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
1155
+		enable-active-high;
1156
+		vin-supply = <&vdd_5v0_sys>;
1157
+	};
11461158 
1147
-		vdd_led: regulator@5 {
1148
-			compatible = "regulator-fixed";
1149
-			reg = <5>;
1150
-			regulator-name = "+VDD_LED";
1151
-			regulator-min-microvolt = <3300000>;
1152
-			regulator-max-microvolt = <3300000>;
1153
-			gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
1154
-			enable-active-high;
1155
-			vin-supply = <&vdd_mux>;
1156
-		};
1159
+	vdd_usb1_vbus: regulator@7 {
1160
+		compatible = "regulator-fixed";
1161
+		regulator-name = "+5V_USB_HS";
1162
+		regulator-min-microvolt = <5000000>;
1163
+		regulator-max-microvolt = <5000000>;
1164
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1165
+		enable-active-high;
1166
+		gpio-open-drain;
1167
+		vin-supply = <&vdd_5v0_sys>;
1168
+	};
11571169 
1158
-		vdd_5v0_ts: regulator@6 {
1159
-			compatible = "regulator-fixed";
1160
-			reg = <6>;
1161
-			regulator-name = "+5V_VDD_TS_SW";
1162
-			regulator-min-microvolt = <5000000>;
1163
-			regulator-max-microvolt = <5000000>;
1164
-			regulator-boot-on;
1165
-			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
1166
-			enable-active-high;
1167
-			vin-supply = <&vdd_5v0_sys>;
1168
-		};
1170
+	vdd_usb3_vbus: regulator@8 {
1171
+		compatible = "regulator-fixed";
1172
+		regulator-name = "+5V_USB_SS";
1173
+		regulator-min-microvolt = <5000000>;
1174
+		regulator-max-microvolt = <5000000>;
1175
+		gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
1176
+		enable-active-high;
1177
+		gpio-open-drain;
1178
+		vin-supply = <&vdd_5v0_sys>;
1179
+	};
11691180 
1170
-		vdd_usb1_vbus: regulator@7 {
1171
-			compatible = "regulator-fixed";
1172
-			reg = <7>;
1173
-			regulator-name = "+5V_USB_HS";
1174
-			regulator-min-microvolt = <5000000>;
1175
-			regulator-max-microvolt = <5000000>;
1176
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1177
-			enable-active-high;
1178
-			gpio-open-drain;
1179
-			vin-supply = <&vdd_5v0_sys>;
1180
-		};
1181
+	vdd_3v3_panel: regulator@9 {
1182
+		compatible = "regulator-fixed";
1183
+		regulator-name = "+3.3V_PANEL";
1184
+		regulator-min-microvolt = <3300000>;
1185
+		regulator-max-microvolt = <3300000>;
1186
+		gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
1187
+		enable-active-high;
1188
+		vin-supply = <&vdd_3v3_run>;
1189
+	};
11811190 
1182
-		vdd_usb3_vbus: regulator@8 {
1183
-			compatible = "regulator-fixed";
1184
-			reg = <8>;
1185
-			regulator-name = "+5V_USB_SS";
1186
-			regulator-min-microvolt = <5000000>;
1187
-			regulator-max-microvolt = <5000000>;
1188
-			gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
1189
-			enable-active-high;
1190
-			gpio-open-drain;
1191
-			vin-supply = <&vdd_5v0_sys>;
1192
-		};
1191
+	vdd_3v3_lp0: regulator@10 {
1192
+		compatible = "regulator-fixed";
1193
+		regulator-name = "+3.3V_LP0";
1194
+		regulator-min-microvolt = <3300000>;
1195
+		regulator-max-microvolt = <3300000>;
1196
+		/*
1197
+		 * TODO: find a way to wire this up with the USB EHCI
1198
+		 * controllers so that it can be enabled on demand.
1199
+		 */
1200
+		regulator-always-on;
1201
+		gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
1202
+		enable-active-high;
1203
+		vin-supply = <&vdd_3v3_sys>;
1204
+	};
11931205 
1194
-		vdd_3v3_panel: regulator@9 {
1195
-			compatible = "regulator-fixed";
1196
-			reg = <9>;
1197
-			regulator-name = "+3.3V_PANEL";
1198
-			regulator-min-microvolt = <3300000>;
1199
-			regulator-max-microvolt = <3300000>;
1200
-			gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
1201
-			enable-active-high;
1202
-			vin-supply = <&vdd_3v3_run>;
1203
-		};
1206
+	vdd_hdmi_pll: regulator@11 {
1207
+		compatible = "regulator-fixed";
1208
+		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
1209
+		regulator-min-microvolt = <1050000>;
1210
+		regulator-max-microvolt = <1050000>;
1211
+		gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
1212
+		vin-supply = <&vdd_1v05_run>;
1213
+	};
12041214 
1205
-		vdd_3v3_lp0: regulator@10 {
1206
-			compatible = "regulator-fixed";
1207
-			reg = <10>;
1208
-			regulator-name = "+3.3V_LP0";
1209
-			regulator-min-microvolt = <3300000>;
1210
-			regulator-max-microvolt = <3300000>;
1211
-			/*
1212
-			 * TODO: find a way to wire this up with the USB EHCI
1213
-			 * controllers so that it can be enabled on demand.
1214
-			 */
1215
-			regulator-always-on;
1216
-			gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
1217
-			enable-active-high;
1218
-			vin-supply = <&vdd_3v3_sys>;
1219
-		};
1220
-
1221
-		vdd_hdmi_pll: regulator@11 {
1222
-			compatible = "regulator-fixed";
1223
-			reg = <11>;
1224
-			regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
1225
-			regulator-min-microvolt = <1050000>;
1226
-			regulator-max-microvolt = <1050000>;
1227
-			gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
1228
-			vin-supply = <&vdd_1v05_run>;
1229
-		};
1230
-
1231
-		vdd_5v0_hdmi: regulator@12 {
1232
-			compatible = "regulator-fixed";
1233
-			reg = <12>;
1234
-			regulator-name = "+5V_HDMI_CON";
1235
-			regulator-min-microvolt = <5000000>;
1236
-			regulator-max-microvolt = <5000000>;
1237
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
1238
-			enable-active-high;
1239
-			vin-supply = <&vdd_5v0_sys>;
1240
-		};
1215
+	vdd_5v0_hdmi: regulator@12 {
1216
+		compatible = "regulator-fixed";
1217
+		regulator-name = "+5V_HDMI_CON";
1218
+		regulator-min-microvolt = <5000000>;
1219
+		regulator-max-microvolt = <5000000>;
1220
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
1221
+		enable-active-high;
1222
+		vin-supply = <&vdd_5v0_sys>;
12411223 	};
12421224 
12431225 	sound {
....@@ -1258,8 +1240,14 @@
12581240 
12591241 		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
12601242 			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
1261
-			 <&tegra_car TEGRA124_CLK_EXTERN1>;
1243
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
12621244 		clock-names = "pll_a", "pll_a_out0", "mclk";
1245
+
1246
+		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
1247
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
1248
+
1249
+		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
1250
+					 <&tegra_car TEGRA124_CLK_EXTERN1>;
12631251 	};
12641252 };
12651253