hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/tegra114-roth.dts
....@@ -37,7 +37,7 @@
3737 dsi@54300000 {
3838 status = "okay";
3939
40
- vdd-supply = <&vdd_1v2_ap>;
40
+ avdd-dsi-csi-supply = <&vdd_1v2_ap>;
4141
4242 panel@0 {
4343 compatible = "lg,lh500wx1-sd03";
....@@ -962,7 +962,7 @@
962962 };
963963
964964 /* SD card */
965
- sdhci@78000400 {
965
+ mmc@78000400 {
966966 status = "okay";
967967 bus-width = <4>;
968968 vqmmc-supply = <&vddio_sdmmc3>;
....@@ -971,7 +971,7 @@
971971 };
972972
973973 /* eMMC */
974
- sdhci@78000600 {
974
+ mmc@78000600 {
975975 status = "okay";
976976 bus-width = <8>;
977977 non-removable;
....@@ -1016,17 +1016,10 @@
10161016 enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
10171017 };
10181018
1019
- clocks {
1020
- compatible = "simple-bus";
1021
- #address-cells = <1>;
1022
- #size-cells = <0>;
1023
-
1024
- clk32k_in: clock@0 {
1025
- compatible = "fixed-clock";
1026
- reg = <0>;
1027
- #clock-cells = <0>;
1028
- clock-frequency = <32768>;
1029
- };
1019
+ clk32k_in: clock@0 {
1020
+ compatible = "fixed-clock";
1021
+ clock-frequency = <32768>;
1022
+ #clock-cells = <0>;
10301023 };
10311024
10321025 gpio-keys {
....@@ -1052,76 +1045,64 @@
10521045 };
10531046 };
10541047
1055
- regulators {
1056
- compatible = "simple-bus";
1057
- #address-cells = <1>;
1058
- #size-cells = <0>;
1048
+ lcd_bl_en: regulator@0 {
1049
+ compatible = "regulator-fixed";
1050
+ regulator-name = "lcd_bl_en";
1051
+ regulator-min-microvolt = <5000000>;
1052
+ regulator-max-microvolt = <5000000>;
1053
+ regulator-boot-on;
1054
+ };
10591055
1060
- lcd_bl_en: regulator@0 {
1061
- compatible = "regulator-fixed";
1062
- reg = <0>;
1063
- regulator-name = "lcd_bl_en";
1064
- regulator-min-microvolt = <5000000>;
1065
- regulator-max-microvolt = <5000000>;
1066
- regulator-boot-on;
1067
- };
1056
+ vdd_lcd: regulator@1 {
1057
+ compatible = "regulator-fixed";
1058
+ regulator-name = "vdd_lcd_1v8";
1059
+ regulator-min-microvolt = <1800000>;
1060
+ regulator-max-microvolt = <1800000>;
1061
+ vin-supply = <&vdd_1v8>;
1062
+ enable-active-high;
1063
+ gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
1064
+ regulator-boot-on;
1065
+ };
10681066
1069
- vdd_lcd: regulator@1 {
1070
- compatible = "regulator-fixed";
1071
- reg = <1>;
1072
- regulator-name = "vdd_lcd_1v8";
1073
- regulator-min-microvolt = <1800000>;
1074
- regulator-max-microvolt = <1800000>;
1075
- vin-supply = <&vdd_1v8>;
1076
- enable-active-high;
1077
- gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
1078
- regulator-boot-on;
1079
- };
1067
+ regulator@2 {
1068
+ compatible = "regulator-fixed";
1069
+ regulator-name = "vdd_1v8_ts";
1070
+ regulator-min-microvolt = <1800000>;
1071
+ regulator-max-microvolt = <1800000>;
1072
+ gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>;
1073
+ regulator-boot-on;
1074
+ };
10801075
1081
- regulator@2 {
1082
- compatible = "regulator-fixed";
1083
- reg = <2>;
1084
- regulator-name = "vdd_1v8_ts";
1085
- regulator-min-microvolt = <1800000>;
1086
- regulator-max-microvolt = <1800000>;
1087
- gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>;
1088
- regulator-boot-on;
1089
- };
1076
+ regulator@3 {
1077
+ compatible = "regulator-fixed";
1078
+ regulator-name = "vdd_3v3_ts";
1079
+ regulator-min-microvolt = <3300000>;
1080
+ regulator-max-microvolt = <3300000>;
1081
+ enable-active-high;
1082
+ gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
1083
+ regulator-boot-on;
1084
+ };
10901085
1091
- regulator@3 {
1092
- compatible = "regulator-fixed";
1093
- reg = <3>;
1094
- regulator-name = "vdd_3v3_ts";
1095
- regulator-min-microvolt = <3300000>;
1096
- regulator-max-microvolt = <3300000>;
1097
- enable-active-high;
1098
- gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
1099
- regulator-boot-on;
1100
- };
1086
+ regulator@4 {
1087
+ compatible = "regulator-fixed";
1088
+ regulator-name = "vdd_1v8_com";
1089
+ regulator-min-microvolt = <1800000>;
1090
+ regulator-max-microvolt = <1800000>;
1091
+ vin-supply = <&vdd_1v8>;
1092
+ enable-active-high;
1093
+ gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
1094
+ regulator-boot-on;
1095
+ };
11011096
1102
- regulator@4 {
1103
- compatible = "regulator-fixed";
1104
- reg = <4>;
1105
- regulator-name = "vdd_1v8_com";
1106
- regulator-min-microvolt = <1800000>;
1107
- regulator-max-microvolt = <1800000>;
1108
- vin-supply = <&vdd_1v8>;
1109
- enable-active-high;
1110
- gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
1111
- regulator-boot-on;
1112
- };
1113
-
1114
- regulator@5 {
1115
- compatible = "regulator-fixed";
1116
- reg = <5>;
1117
- regulator-name = "vdd_3v3_com";
1118
- regulator-min-microvolt = <3300000>;
1119
- regulator-max-microvolt = <3300000>;
1120
- vin-supply = <&vdd_3v3_sys>;
1121
- enable-active-high;
1122
- gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
1123
- regulator-always-on;
1124
- regulator-boot-on;
1125
- };
1097
+ regulator@5 {
1098
+ compatible = "regulator-fixed";
1099
+ regulator-name = "vdd_3v3_com";
1100
+ regulator-min-microvolt = <3300000>;
1101
+ regulator-max-microvolt = <3300000>;
1102
+ vin-supply = <&vdd_3v3_sys>;
1103
+ enable-active-high;
1104
+ gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
1105
+ regulator-always-on;
1106
+ regulator-boot-on;
11261107 };
11271108 };