forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 645e752c5a84baeb21015cdc85fc05b7d16312c8 
 kernel/arch/arm/boot/dts/tegra114-dalmore.dts
....@@ -46,8 +46,7 @@
4646 			avdd-dsi-csi-supply = <&avdd_1v2_reg>;
4747 
4848 			panel@0 {
49
-				compatible = "panasonic,vvx10f004b00",
50
-					     "simple-panel";
49
+				compatible = "panasonic,vvx10f004b00";
5150 				reg = <0>;
5251 
5352 				power-supply = <&avdd_lcd_reg>;
....@@ -770,7 +769,6 @@
770769 		battery: smart-battery@b {
771770 			compatible = "ti,bq20z45", "sbs,sbs-battery";
772771 			reg = <0xb>;
773
-			battery-name = "battery";
774772 			sbs,i2c-retry-count = <2>;
775773 			sbs,poll-retry-count = <100>;
776774 			power-supplies = <&charger>;
....@@ -1087,7 +1085,7 @@
10871085 		status = "okay";
10881086 		spi-max-frequency = <25000000>;
10891087 		spi-flash@0 {
1090
-			compatible = "winbond,w25q32dw";
1088
+			compatible = "winbond,w25q32dw", "jedec,spi-nor";
10911089 			reg = <0>;
10921090 			spi-max-frequency = <20000000>;
10931091 		};
....@@ -1110,14 +1108,14 @@
11101108 		};
11111109 	};
11121110 
1113
-	sdhci@78000400 {
1111
+	mmc@78000400 {
11141112 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
11151113 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
11161114 		bus-width = <4>;
11171115 		status = "okay";
11181116 	};
11191117 
1120
-	sdhci@78000600 {
1118
+	mmc@78000600 {
11211119 		bus-width = <8>;
11221120 		status = "okay";
11231121 		non-removable;
....@@ -1153,17 +1151,10 @@
11531151 		default-brightness-level = <6>;
11541152 	};
11551153 
1156
-	clocks {
1157
-		compatible = "simple-bus";
1158
-		#address-cells = <1>;
1159
-		#size-cells = <0>;
1160
-
1161
-		clk32k_in: clock@0 {
1162
-			compatible = "fixed-clock";
1163
-			reg = <0>;
1164
-			#clock-cells = <0>;
1165
-			clock-frequency = <32768>;
1166
-		};
1154
+	clk32k_in: clock@0 {
1155
+		compatible = "fixed-clock";
1156
+		clock-frequency = <32768>;
1157
+		#clock-cells = <0>;
11671158 	};
11681159 
11691160 	gpio-keys {
....@@ -1195,83 +1186,70 @@
11951186 		};
11961187 	};
11971188 
1198
-	regulators {
1199
-		compatible = "simple-bus";
1200
-		#address-cells = <1>;
1201
-		#size-cells = <0>;
1189
+	vdd_ac_bat_reg: regulator@0 {
1190
+		compatible = "regulator-fixed";
1191
+		regulator-name = "vdd_ac_bat";
1192
+		regulator-min-microvolt = <5000000>;
1193
+		regulator-max-microvolt = <5000000>;
1194
+		regulator-always-on;
1195
+	};
12021196 
1203
-		vdd_ac_bat_reg: regulator@0 {
1204
-			compatible = "regulator-fixed";
1205
-			reg = <0>;
1206
-			regulator-name = "vdd_ac_bat";
1207
-			regulator-min-microvolt = <5000000>;
1208
-			regulator-max-microvolt = <5000000>;
1209
-			regulator-always-on;
1210
-		};
1197
+	dvdd_ts_reg: regulator@1 {
1198
+		compatible = "regulator-fixed";
1199
+		regulator-name = "dvdd_ts";
1200
+		regulator-min-microvolt = <1800000>;
1201
+		regulator-max-microvolt = <1800000>;
1202
+		enable-active-high;
1203
+		gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
1204
+	};
12111205 
1212
-		dvdd_ts_reg: regulator@1 {
1213
-			compatible = "regulator-fixed";
1214
-			reg = <1>;
1215
-			regulator-name = "dvdd_ts";
1216
-			regulator-min-microvolt = <1800000>;
1217
-			regulator-max-microvolt = <1800000>;
1218
-			enable-active-high;
1219
-			gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
1220
-		};
1206
+	usb1_vbus_reg: regulator@3 {
1207
+		compatible = "regulator-fixed";
1208
+		regulator-name = "usb1_vbus";
1209
+		regulator-min-microvolt = <5000000>;
1210
+		regulator-max-microvolt = <5000000>;
1211
+		enable-active-high;
1212
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1213
+		gpio-open-drain;
1214
+		vin-supply = <&tps65090_dcdc1_reg>;
1215
+	};
12211216 
1222
-		usb1_vbus_reg: regulator@3 {
1223
-			compatible = "regulator-fixed";
1224
-			reg = <3>;
1225
-			regulator-name = "usb1_vbus";
1226
-			regulator-min-microvolt = <5000000>;
1227
-			regulator-max-microvolt = <5000000>;
1228
-			enable-active-high;
1229
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
1230
-			gpio-open-drain;
1231
-			vin-supply = <&tps65090_dcdc1_reg>;
1232
-		};
1217
+	usb3_vbus_reg: regulator@4 {
1218
+		compatible = "regulator-fixed";
1219
+		regulator-name = "usb2_vbus";
1220
+		regulator-min-microvolt = <5000000>;
1221
+		regulator-max-microvolt = <5000000>;
1222
+		enable-active-high;
1223
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
1224
+		gpio-open-drain;
1225
+		vin-supply = <&tps65090_dcdc1_reg>;
1226
+	};
12331227 
1234
-		usb3_vbus_reg: regulator@4 {
1235
-			compatible = "regulator-fixed";
1236
-			reg = <4>;
1237
-			regulator-name = "usb2_vbus";
1238
-			regulator-min-microvolt = <5000000>;
1239
-			regulator-max-microvolt = <5000000>;
1240
-			enable-active-high;
1241
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
1242
-			gpio-open-drain;
1243
-			vin-supply = <&tps65090_dcdc1_reg>;
1244
-		};
1228
+	vdd_hdmi_reg: regulator@5 {
1229
+		compatible = "regulator-fixed";
1230
+		regulator-name = "vdd_hdmi_5v0";
1231
+		regulator-min-microvolt = <5000000>;
1232
+		regulator-max-microvolt = <5000000>;
1233
+		vin-supply = <&tps65090_dcdc1_reg>;
1234
+	};
12451235 
1246
-		vdd_hdmi_reg: regulator@5 {
1247
-			compatible = "regulator-fixed";
1248
-			reg = <5>;
1249
-			regulator-name = "vdd_hdmi_5v0";
1250
-			regulator-min-microvolt = <5000000>;
1251
-			regulator-max-microvolt = <5000000>;
1252
-			vin-supply = <&tps65090_dcdc1_reg>;
1253
-		};
1236
+	vdd_cam_1v8_reg: regulator@6 {
1237
+		compatible = "regulator-fixed";
1238
+		regulator-name = "vdd_cam_1v8_reg";
1239
+		regulator-min-microvolt = <1800000>;
1240
+		regulator-max-microvolt = <1800000>;
1241
+		enable-active-high;
1242
+		gpio = <&palmas_gpio 6 0>;
1243
+	};
12541244 
1255
-		vdd_cam_1v8_reg: regulator@6 {
1256
-			compatible = "regulator-fixed";
1257
-			reg = <6>;
1258
-			regulator-name = "vdd_cam_1v8_reg";
1259
-			regulator-min-microvolt = <1800000>;
1260
-			regulator-max-microvolt = <1800000>;
1261
-			enable-active-high;
1262
-			gpio = <&palmas_gpio 6 0>;
1263
-		};
1264
-
1265
-		vdd_5v0_hdmi: regulator@7 {
1266
-			compatible = "regulator-fixed";
1267
-			reg = <7>;
1268
-			regulator-name = "VDD_5V0_HDMI_CON";
1269
-			regulator-min-microvolt = <5000000>;
1270
-			regulator-max-microvolt = <5000000>;
1271
-			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
1272
-			enable-active-high;
1273
-			vin-supply = <&tps65090_dcdc1_reg>;
1274
-		};
1245
+	vdd_5v0_hdmi: regulator@7 {
1246
+		compatible = "regulator-fixed";
1247
+		regulator-name = "VDD_5V0_HDMI_CON";
1248
+		regulator-min-microvolt = <5000000>;
1249
+		regulator-max-microvolt = <5000000>;
1250
+		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
1251
+		enable-active-high;
1252
+		vin-supply = <&tps65090_dcdc1_reg>;
12751253 	};
12761254 
12771255 	sound {
....@@ -1296,7 +1274,13 @@
12961274 
12971275 		clocks = <&tegra_car TEGRA114_CLK_PLL_A>,
12981276 			 <&tegra_car TEGRA114_CLK_PLL_A_OUT0>,
1299
-			 <&tegra_car TEGRA114_CLK_EXTERN1>;
1277
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
13001278 		clock-names = "pll_a", "pll_a_out0", "mclk";
1279
+
1280
+		assigned-clocks = <&tegra_car TEGRA114_CLK_EXTERN1>,
1281
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
1282
+
1283
+		assigned-clock-parents = <&tegra_car TEGRA114_CLK_PLL_A_OUT0>,
1284
+					 <&tegra_car TEGRA114_CLK_EXTERN1>;
13011285 	};
13021286 };