kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
..
..
@@ -58,8 +58,6 @@
58
58
 
59
59
 	leds {
60
60
 		compatible = "gpio-leds";
61
-		pinctrl-names = "default";
62
-		pinctrl-0 = <&led_pins_bpi_m2>;
63
61
 
64
62
 		blue {
65
63
 			label = "bpi-m2:blue:usr";
..
..
@@ -79,8 +77,6 @@
79
77
 
80
78
 	mmc2_pwrseq: mmc2_pwrseq {
81
79
 		compatible = "mmc-pwrseq-simple";
82
-		pinctrl-names = "default";
83
-		pinctrl-0 = <&mmc2_pwrseq_pin_bpi_m2>;
84
80
 		reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */
85
81
 	};
86
82
 };
..
..
@@ -95,42 +91,38 @@
95
91
 
96
92
 &gmac {
97
93
 	pinctrl-names = "default";
98
-	pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>;
99
-	phy = <&phy1>;
94
+	pinctrl-0 = <&gmac_rgmii_pins>;
95
+	phy-handle = <&phy1>;
100
96
 	phy-mode = "rgmii";
101
97
 	phy-supply = <&reg_dldo1>;
102
-	snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */
103
-	snps,reset-active-low;
104
-	snps,reset-delays-us = <0 10000 30000>;
105
98
 	status = "okay";
106
-
107
-	phy1: ethernet-phy@1 {
108
-		reg = <1>;
109
-	};
110
99
 };
111
100
 
112
101
 &ir {
113
102
 	pinctrl-names = "default";
114
-	pinctrl-0 = <&ir_pins_a>;
103
+	pinctrl-0 = <&s_ir_rx_pin>;
115
104
 	status = "okay";
116
105
 };
117
106
 
107
+&mdio {
108
+	phy1: ethernet-phy@1 {
109
+		reg = <1>;
110
+		reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>; /* PA21 */
111
+		reset-assert-us = <10000>;
112
+		reset-deassert-us = <30000>;
113
+	};
114
+};
115
+
118
116
 &mmc0 {
119
-	pinctrl-names = "default";
120
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
121
117
 	vmmc-supply = <&reg_dcdc1>;
122
118
 	bus-width = <4>;
123
119
 	cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
124
120
 	status = "okay";
125
121
 };
126
122
 
127
-&mmc0_pins_a {
128
-	bias-pull-up;
129
-};
130
-
131
123
 &mmc2 {
132
124
 	pinctrl-names = "default";
133
-	pinctrl-0 = <&mmc2_pins_a>;
125
+	pinctrl-0 = <&mmc2_4bit_pins>;
134
126
 	vmmc-supply = <&reg_aldo1>;
135
127
 	mmc-pwrseq = <&mmc2_pwrseq>;
136
128
 	bus-width = <4>;
..
..
@@ -144,10 +136,6 @@
144
136
 		interrupts = <0 5 IRQ_TYPE_LEVEL_LOW>; /* PL5 */
145
137
 		interrupt-names = "host-wake";
146
138
 	};
147
-};
148
-
149
-&mmc2_pins_a {
150
-	bias-pull-up;
151
139
 };
152
140
 
153
141
 &ohci0 {
..
..
@@ -164,31 +152,6 @@
164
152
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
165
153
 		eldoin-supply = <&reg_dcdc1>;
166
154
 		x-powers,drive-vbus-en;
167
-	};
168
-};
169
-
170
-&pio {
171
-	gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {
172
-		pins = "PA21";
173
-		function = "gpio_out";
174
-	};
175
-
176
-	led_pins_bpi_m2: led_pins@0 {
177
-		pins = "PG5", "PG10", "PG11";
178
-		function = "gpio_out";
179
-	};
180
-
181
-	mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
182
-		pins = "PA4";
183
-		function = "gpio_in";
184
-		bias-pull-up;
185
-	};
186
-};
187
-
188
-&r_pio {
189
-	mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
190
-		pins = "PL8";
191
-		function = "gpio_out";
192
155
 	};
193
156
 };
194
157
 
..
..
@@ -291,7 +254,7 @@
291
254
 
292
255
 &uart0 {
293
256
 	pinctrl-names = "default";
294
-	pinctrl-0 = <&uart0_pins_a>;
257
+	pinctrl-0 = <&uart0_ph_pins>;
295
258
 	status = "okay";
296
259
 };
297
260