kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
..
..
@@ -66,8 +66,6 @@
66
66
 
67
67
 	leds {
68
68
 		compatible = "gpio-leds";
69
-		pinctrl-names = "default";
70
-		pinctrl-0 = <&led_pin_sina31s>;
71
69
 
72
70
 		status {
73
71
 			label = "sina31s:status:usr";
..
..
@@ -116,15 +114,11 @@
116
114
 
117
115
 &gmac {
118
116
 	pinctrl-names = "default";
119
-	pinctrl-0 = <&gmac_pins_mii_a>;
120
-	phy = <&phy1>;
117
+	pinctrl-0 = <&gmac_mii_pins>;
118
+	phy-handle = <&phy1>;
121
119
 	phy-mode = "mii";
122
120
 	phy-supply = <&reg_dldo1>;
123
121
 	status = "okay";
124
-
125
-	phy1: ethernet-phy@1 {
126
-		reg = <1>;
127
-	};
128
122
 };
129
123
 
130
124
 &hdmi {
..
..
@@ -139,7 +133,7 @@
139
133
 
140
134
 &ir {
141
135
 	pinctrl-names = "default";
142
-	pinctrl-0 = <&ir_pins_a>;
136
+	pinctrl-0 = <&s_ir_rx_pin>;
143
137
 	status = "okay";
144
138
 };
145
139
 
..
..
@@ -147,14 +141,14 @@
147
141
 	vref-supply = <&reg_aldo3>;
148
142
 	status = "okay";
149
143
 
150
-	button@158 {
144
+	button-158 {
151
145
 		label = "Volume Up";
152
146
 		linux,code = <KEY_VOLUMEUP>;
153
147
 		channel = <0>;
154
148
 		voltage = <158730>;
155
149
 	};
156
150
 
157
-	button@349 {
151
+	button-349 {
158
152
 		label = "Volume Down";
159
153
 		linux,code = <KEY_VOLUMEDOWN>;
160
154
 		channel = <0>;
..
..
@@ -162,9 +156,13 @@
162
156
 	};
163
157
 };
164
158
 
159
+&mdio {
160
+	phy1: ethernet-phy@1 {
161
+		reg = <1>;
162
+	};
163
+};
164
+
165
165
 &mmc0 {
166
-	pinctrl-names = "default";
167
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
168
166
 	vmmc-supply = <&reg_dcdc1>;
169
167
 	bus-width = <4>;
170
168
 	cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
..
..
@@ -175,19 +173,6 @@
175
173
 	status = "okay";
176
174
 };
177
175
 
178
-&pio {
179
-	led_pin_sina31s: led_pin@0 {
180
-		pins = "PH13";
181
-		function = "gpio_out";
182
-	};
183
-
184
-	mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
185
-		pins = "PA4";
186
-		function = "gpio_in";
187
-		bias-pull-up;
188
-	};
189
-};
190
-
191
176
 &reg_dldo1 {
192
177
 	regulator-min-microvolt = <3300000>;
193
178
 	regulator-max-microvolt = <3300000>;
..
..
@@ -196,7 +181,7 @@
196
181
 
197
182
 &spdif {
198
183
 	pinctrl-names = "default";
199
-	pinctrl-0 = <&spdif_pins_a>;
184
+	pinctrl-0 = <&spdif_tx_pin>;
200
185
 	status = "okay";
201
186
 };
202
187