forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-11-22 9ca5fbcb63a8dcaee0527f96afb91dc4b4bd8fa9 
 kernel/arch/arm/boot/dts/rk3036.dtsi
....@@ -742,35 +742,31 @@
742742 			bias-pull-pin-default;
743743 		};
744744 
745
-		pcfg_pull_up: pcfg-pull-up {
746
-			bias-pull-up;
747
-		};
748
-
749745 		pcfg_pull_none: pcfg-pull-none {
750746 			bias-disable;
751747 		};
752748 
753749 		pwm0 {
754750 			pwm0_pin: pwm0-pin {
755
-				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
751
+				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_default>;
756752 			};
757753 		};
758754 
759755 		pwm1 {
760756 			pwm1_pin: pwm1-pin {
761
-				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;
757
+				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_default>;
762758 			};
763759 		};
764760 
765761 		pwm2 {
766762 			pwm2_pin: pwm2-pin {
767
-				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;
763
+				rockchip,pins = <0 RK_PA1 2 &pcfg_pull_default>;
768764 			};
769765 		};
770766 
771767 		pwm3 {
772768 			pwm3_pin: pwm3-pin {
773
-				rockchip,pins = <0 RK_PD3 1 &pcfg_pull_none>;
769
+				rockchip,pins = <0 RK_PD3 1 &pcfg_pull_default>;
774770 			};
775771 		};
776772 
....@@ -906,8 +902,8 @@
906902 
907903 		uart0 {
908904 			uart0_xfer: uart0-xfer {
909
-				rockchip,pins = <0 RK_PC0 1 &pcfg_pull_up>,
910
-						<0 RK_PC1 1 &pcfg_pull_up>;
905
+				rockchip,pins = <0 RK_PC0 1 &pcfg_pull_default>,
906
+						<0 RK_PC1 1 &pcfg_pull_default>;
911907 			};
912908 
913909 			uart0_cts: uart0-cts {
....@@ -921,16 +917,16 @@
921917 
922918 		uart1 {
923919 			uart1_xfer: uart1-xfer {
924
-				rockchip,pins = <2 RK_PC6 1 &pcfg_pull_up>,
925
-						<2 RK_PC7 1 &pcfg_pull_up>;
920
+				rockchip,pins = <2 RK_PC6 1 &pcfg_pull_default>,
921
+						<2 RK_PC7 1 &pcfg_pull_default>;
926922 			};
927923 			/* no rts / cts for uart1 */
928924 		};
929925 
930926 		uart2 {
931927 			uart2_xfer: uart2-xfer {
932
-				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
933
-						<1 RK_PC3 2 &pcfg_pull_up>;
928
+				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_default>,
929
+						<1 RK_PC3 2 &pcfg_pull_default>;
934930 			};
935931 			/* no rts / cts for uart2 */
936932 		};