修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
..
..
@@ -77,26 +77,18 @@
77
77
 };
78
78
 
79
79
 &i2c0 {
80
-	pinctrl-names = "default";
81
-	pinctrl-0 = <&i2c0_pins_a>;
82
80
 	status = "okay";
83
81
 };
84
82
 
85
83
 &i2c1 {
86
-	pinctrl-names = "default";
87
-	pinctrl-0 = <&i2c1_pins_a>;
88
84
 	status = "okay";
89
85
 };
90
86
 
91
87
 &i2c2 {
92
-	pinctrl-names = "default";
93
-	pinctrl-0 = <&i2c2_pins_a>;
94
88
 	status = "okay";
95
89
 };
96
90
 
97
91
 &mmc0 {
98
-	pinctrl-names = "default";
99
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
100
92
 	vmmc-supply = <&reg_vcc3v3>;
101
93
 	bus-width = <4>;
102
94
 	cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
..
..
@@ -112,56 +104,26 @@
112
104
 };
113
105
 
114
106
 &pio {
115
-	mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
116
-		pins = "PG0";
117
-		function = "gpio_in";
118
-		bias-pull-up;
119
-	};
120
-
121
-	led_pins_olinuxinom: led_pins@0 {
107
+	led_pins_olinuxinom: led-pin {
122
108
 		pins = "PG9";
123
109
 		function = "gpio_out";
124
110
 		drive-strength = <20>;
125
111
 	};
126
-
127
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
128
-		pins = "PG2";
129
-		function = "gpio_in";
130
-		bias-pull-up;
131
-	};
132
-
133
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
134
-		pins = "PG1";
135
-		function = "gpio_in";
136
-		bias-pull-down;
137
-	};
138
-
139
-	usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {
140
-		pins = "PG12";
141
-		function = "gpio_out";
142
-	};
143
-
144
-	usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
145
-		pins = "PG11";
146
-		function = "gpio_out";
147
-	};
148
112
 };
149
113
 
150
114
 &reg_usb0_vbus {
151
-	pinctrl-0 = <&usb0_vbus_pin_olinuxinom>;
152
115
 	gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>;
153
116
 	status = "okay";
154
117
 };
155
118
 
156
119
 &reg_usb1_vbus {
157
-	pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
158
120
 	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
159
121
 	status = "okay";
160
122
 };
161
123
 
162
124
 &uart1 {
163
125
 	pinctrl-names = "default";
164
-	pinctrl-0 = <&uart1_pins_b>;
126
+	pinctrl-0 = <&uart1_pg_pins>;
165
127
 	status = "okay";
166
128
 };
167
129
 
..
..
@@ -171,10 +133,8 @@
171
133
 };
172
134
 
173
135
 &usbphy {
174
-	pinctrl-names = "default";
175
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
176
-	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
177
-	usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
136
+	usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
137
+	usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
178
138
 	usb0_vbus-supply = <&reg_usb0_vbus>;
179
139
 	usb1_vbus-supply = <&reg_usb1_vbus>;
180
140
 	status = "okay";