forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614 
 kernel/arch/arm/boot/dts/tegra20-seaboard.dts
....@@ -394,10 +394,10 @@
394394 			#size-cells = <0>;
395395 
396396 			smart-battery@b {
397
-				compatible = "ti,bq20z75", "smart-battery-1.1";
397
+				compatible = "ti,bq20z75", "sbs,sbs-battery";
398398 				reg = <0xb>;
399
-				ti,i2c-retry-count = <2>;
400
-				ti,poll-retry-count = <10>;
399
+				sbs,i2c-retry-count = <2>;
400
+				sbs,poll-retry-count = <10>;
401401 			};
402402 		};
403403 	};
....@@ -760,14 +760,14 @@
760760 		status = "okay";
761761 	};
762762 
763
-	sdhci@c8000000 {
763
+	mmc@c8000000 {
764764 		status = "okay";
765765 		power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
766766 		bus-width = <4>;
767767 		keep-power-in-suspend;
768768 	};
769769 
770
-	sdhci@c8000400 {
770
+	mmc@c8000400 {
771771 		status = "okay";
772772 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
773773 		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
....@@ -775,7 +775,7 @@
775775 		bus-width = <4>;
776776 	};
777777 
778
-	sdhci@c8000600 {
778
+	mmc@c8000600 {
779779 		status = "okay";
780780 		bus-width = <8>;
781781 		non-removable;
....@@ -792,17 +792,10 @@
792792 		default-brightness-level = <6>;
793793 	};
794794 
795
-	clocks {
796
-		compatible = "simple-bus";
797
-		#address-cells = <1>;
798
-		#size-cells = <0>;
799
-
800
-		clk32k_in: clock@0 {
801
-			compatible = "fixed-clock";
802
-			reg = <0>;
803
-			#clock-cells = <0>;
804
-			clock-frequency = <32768>;
805
-		};
795
+	clk32k_in: clock@0 {
796
+		compatible = "fixed-clock";
797
+		clock-frequency = <32768>;
798
+		#clock-cells = <0>;
806799 	};
807800 
808801 	gpio-keys {
....@@ -826,7 +819,7 @@
826819 	};
827820 
828821 	panel: panel {
829
-		compatible = "chunghwa,claa101wa01a", "simple-panel";
822
+		compatible = "chunghwa,claa101wa01a";
830823 
831824 		power-supply = <&vdd_pnl_reg>;
832825 		enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
....@@ -835,81 +828,68 @@
835828 		ddc-i2c-bus = <&lvds_ddc>;
836829 	};
837830 
838
-	regulators {
839
-		compatible = "simple-bus";
840
-		#address-cells = <1>;
841
-		#size-cells = <0>;
831
+	vdd_5v0_reg: regulator@0 {
832
+		compatible = "regulator-fixed";
833
+		regulator-name = "vdd_5v0";
834
+		regulator-min-microvolt = <5000000>;
835
+		regulator-max-microvolt = <5000000>;
836
+		regulator-always-on;
837
+	};
842838 
843
-		vdd_5v0_reg: regulator@0 {
844
-			compatible = "regulator-fixed";
845
-			reg = <0>;
846
-			regulator-name = "vdd_5v0";
847
-			regulator-min-microvolt = <5000000>;
848
-			regulator-max-microvolt = <5000000>;
849
-			regulator-always-on;
850
-		};
839
+	regulator@1 {
840
+		compatible = "regulator-fixed";
841
+		regulator-name = "vdd_1v5";
842
+		regulator-min-microvolt = <1500000>;
843
+		regulator-max-microvolt = <1500000>;
844
+		gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
845
+	};
851846 
852
-		regulator@1 {
853
-			compatible = "regulator-fixed";
854
-			reg = <1>;
855
-			regulator-name = "vdd_1v5";
856
-			regulator-min-microvolt = <1500000>;
857
-			regulator-max-microvolt = <1500000>;
858
-			gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
859
-		};
847
+	regulator@2 {
848
+		compatible = "regulator-fixed";
849
+		regulator-name = "vdd_1v2";
850
+		regulator-min-microvolt = <1200000>;
851
+		regulator-max-microvolt = <1200000>;
852
+		gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
853
+		enable-active-high;
854
+	};
860855 
861
-		regulator@2 {
862
-			compatible = "regulator-fixed";
863
-			reg = <2>;
864
-			regulator-name = "vdd_1v2";
865
-			regulator-min-microvolt = <1200000>;
866
-			regulator-max-microvolt = <1200000>;
867
-			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
868
-			enable-active-high;
869
-		};
856
+	vbus_reg: regulator@3 {
857
+		compatible = "regulator-fixed";
858
+		regulator-name = "vdd_vbus_wup1";
859
+		regulator-min-microvolt = <5000000>;
860
+		regulator-max-microvolt = <5000000>;
861
+		enable-active-high;
862
+		gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
863
+		regulator-always-on;
864
+		regulator-boot-on;
865
+	};
870866 
871
-		vbus_reg: regulator@3 {
872
-			compatible = "regulator-fixed";
873
-			reg = <3>;
874
-			regulator-name = "vdd_vbus_wup1";
875
-			regulator-min-microvolt = <5000000>;
876
-			regulator-max-microvolt = <5000000>;
877
-			enable-active-high;
878
-			gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
879
-			regulator-always-on;
880
-			regulator-boot-on;
881
-		};
867
+	vdd_pnl_reg: regulator@4 {
868
+		compatible = "regulator-fixed";
869
+		regulator-name = "vdd_pnl";
870
+		regulator-min-microvolt = <2800000>;
871
+		regulator-max-microvolt = <2800000>;
872
+		gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
873
+		enable-active-high;
874
+	};
882875 
883
-		vdd_pnl_reg: regulator@4 {
884
-			compatible = "regulator-fixed";
885
-			reg = <4>;
886
-			regulator-name = "vdd_pnl";
887
-			regulator-min-microvolt = <2800000>;
888
-			regulator-max-microvolt = <2800000>;
889
-			gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
890
-			enable-active-high;
891
-		};
876
+	vdd_bl_reg: regulator@5 {
877
+		compatible = "regulator-fixed";
878
+		regulator-name = "vdd_bl";
879
+		regulator-min-microvolt = <2800000>;
880
+		regulator-max-microvolt = <2800000>;
881
+		gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
882
+		enable-active-high;
883
+	};
892884 
893
-		vdd_bl_reg: regulator@5 {
894
-			compatible = "regulator-fixed";
895
-			reg = <5>;
896
-			regulator-name = "vdd_bl";
897
-			regulator-min-microvolt = <2800000>;
898
-			regulator-max-microvolt = <2800000>;
899
-			gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
900
-			enable-active-high;
901
-		};
902
-
903
-		vdd_hdmi: regulator@6 {
904
-			compatible = "regulator-fixed";
905
-			reg = <6>;
906
-			regulator-name = "VDDIO_HDMI";
907
-			regulator-min-microvolt = <5000000>;
908
-			regulator-max-microvolt = <5000000>;
909
-			gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
910
-			enable-active-high;
911
-			vin-supply = <&vdd_5v0_reg>;
912
-		};
885
+	vdd_hdmi: regulator@6 {
886
+		compatible = "regulator-fixed";
887
+		regulator-name = "VDDIO_HDMI";
888
+		regulator-min-microvolt = <5000000>;
889
+		regulator-max-microvolt = <5000000>;
890
+		gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
891
+		enable-active-high;
892
+		vin-supply = <&vdd_5v0_reg>;
913893 	};
914894 
915895 	sound {
....@@ -931,7 +911,7 @@
931911 		nvidia,audio-codec = <&wm8903>;
932912 
933913 		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
934
-		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
914
+		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_LOW>;
935915 
936916 		clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
937917 			 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,