forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87 
 kernel/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
....@@ -74,8 +74,6 @@
7474 
7575 	leds {
7676 		compatible = "gpio-leds";
77
-		pinctrl-names = "default";
78
-		pinctrl-0 = <&led_pins_cubieboard2>;
7977 
8078 		blue {
8179 			label = "cubieboard2:blue:usr";
....@@ -116,14 +114,10 @@
116114 
117115 &gmac {
118116 	pinctrl-names = "default";
119
-	pinctrl-0 = <&gmac_pins_mii_a>;
120
-	phy = <&phy1>;
117
+	pinctrl-0 = <&gmac_mii_pins>;
118
+	phy-handle = <&phy1>;
121119 	phy-mode = "mii";
122120 	status = "okay";
123
-
124
-	phy1: ethernet-phy@1 {
125
-		reg = <1>;
126
-	};
127121 };
128122 
129123 &hdmi {
....@@ -137,8 +131,6 @@
137131 };
138132 
139133 &i2c0 {
140
-	pinctrl-names = "default";
141
-	pinctrl-0 = <&i2c0_pins_a>;
142134 	status = "okay";
143135 
144136 	axp209: pmic@34 {
....@@ -149,24 +141,26 @@
149141 };
150142 
151143 &i2c1 {
152
-	pinctrl-names = "default";
153
-	pinctrl-0 = <&i2c1_pins_a>;
154144 	status = "okay";
155145 };
156146 
157147 &ir0 {
158148 	pinctrl-names = "default";
159
-	pinctrl-0 = <&ir0_rx_pins_a>;
149
+	pinctrl-0 = <&ir0_rx_pin>;
160150 	status = "okay";
161151 };
162152 
163153 &mmc0 {
164
-	pinctrl-names = "default";
165
-	pinctrl-0 = <&mmc0_pins_a>;
166154 	vmmc-supply = <&reg_vcc3v3>;
167155 	bus-width = <4>;
168156 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
169157 	status = "okay";
158
+};
159
+
160
+&gmac_mdio {
161
+	phy1: ethernet-phy@1 {
162
+		reg = <1>;
163
+	};
170164 };
171165 
172166 &ohci0 {
....@@ -179,19 +173,6 @@
179173 
180174 &otg_sram {
181175 	status = "okay";
182
-};
183
-
184
-&pio {
185
-	led_pins_cubieboard2: led_pins@0 {
186
-		pins = "PH20", "PH21";
187
-		function = "gpio_out";
188
-	};
189
-
190
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
191
-		pins = "PH4";
192
-		function = "gpio_in";
193
-		bias-pull-up;
194
-	};
195176 };
196177 
197178 &reg_ahci_5v {
....@@ -239,7 +220,7 @@
239220 
240221 &uart0 {
241222 	pinctrl-names = "default";
242
-	pinctrl-0 = <&uart0_pins_a>;
223
+	pinctrl-0 = <&uart0_pb_pins>;
243224 	status = "okay";
244225 };
245226 
....@@ -249,9 +230,7 @@
249230 };
250231 
251232 &usbphy {
252
-	pinctrl-names = "default";
253
-	pinctrl-0 = <&usb0_id_detect_pin>;
254
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
233
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
255234 	usb1_vbus-supply = <&reg_usb1_vbus>;
256235 	usb2_vbus-supply = <&reg_usb2_vbus>;
257236 	status = "okay";