add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
..
..
@@ -63,8 +63,6 @@
63
63
 
64
64
 	leds {
65
65
 		compatible = "gpio-leds";
66
-		pinctrl-names = "default";
67
-		pinctrl-0 = <&led_pins_pcduino3>;
68
66
 
69
67
 		tx {
70
68
 			label = "pcduino3:green:tx";
..
..
@@ -77,23 +75,22 @@
77
75
 		};
78
76
 	};
79
77
 
80
-	gpio_keys {
78
+	gpio-keys {
81
79
 		compatible = "gpio-keys";
82
-		pinctrl-names = "default";
83
-		pinctrl-0 = <&key_pins_pcduino3>;
84
-		#address-cells = <1>;
85
-		#size-cells = <0>;
86
-		button@0 {
80
+
81
+		back {
87
82
 			label = "Key Back";
88
83
 			linux,code = <KEY_BACK>;
89
84
 			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
90
85
 		};
91
-		button@1 {
86
+
87
+		home {
92
88
 			label = "Key Home";
93
89
 			linux,code = <KEY_HOME>;
94
90
 			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
95
91
 		};
96
-		button@2 {
92
+
93
+		menu {
97
94
 			label = "Key Menu";
98
95
 			linux,code = <KEY_MENU>;
99
96
 			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
..
..
@@ -124,19 +121,13 @@
124
121
 
125
122
 &gmac {
126
123
 	pinctrl-names = "default";
127
-	pinctrl-0 = <&gmac_pins_mii_a>;
128
-	phy = <&phy1>;
124
+	pinctrl-0 = <&gmac_mii_pins>;
125
+	phy-handle = <&phy1>;
129
126
 	phy-mode = "mii";
130
127
 	status = "okay";
131
-
132
-	phy1: ethernet-phy@1 {
133
-		reg = <1>;
134
-	};
135
128
 };
136
129
 
137
130
 &i2c0 {
138
-	pinctrl-names = "default";
139
-	pinctrl-0 = <&i2c0_pins_a>;
140
131
 	status = "okay";
141
132
 
142
133
 	axp209: pmic@34 {
..
..
@@ -150,13 +141,17 @@
150
141
 
151
142
 &ir0 {
152
143
 	pinctrl-names = "default";
153
-	pinctrl-0 = <&ir0_rx_pins_a>;
144
+	pinctrl-0 = <&ir0_rx_pin>;
154
145
 	status = "okay";
155
146
 };
156
147
 
148
+&gmac_mdio {
149
+	phy1: ethernet-phy@1 {
150
+		reg = <1>;
151
+	};
152
+};
153
+
157
154
 &mmc0 {
158
-	pinctrl-names = "default";
159
-	pinctrl-0 = <&mmc0_pins_a>;
160
155
 	vmmc-supply = <&reg_vcc3v3>;
161
156
 	bus-width = <4>;
162
157
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -173,24 +168,6 @@
173
168
 
174
169
 &otg_sram {
175
170
 	status = "okay";
176
-};
177
-
178
-&pio {
179
-	led_pins_pcduino3: led_pins@0 {
180
-		pins = "PH15", "PH16";
181
-		function = "gpio_out";
182
-	};
183
-
184
-	key_pins_pcduino3: key_pins@0 {
185
-		pins = "PH17", "PH18", "PH19";
186
-		function = "gpio_in";
187
-	};
188
-
189
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
190
-		pins = "PH4";
191
-		function = "gpio_in";
192
-		bias-pull-up;
193
-	};
194
171
 };
195
172
 
196
173
 &reg_ahci_5v {
..
..
@@ -233,7 +210,7 @@
233
210
 
234
211
 &uart0 {
235
212
 	pinctrl-names = "default";
236
-	pinctrl-0 = <&uart0_pins_a>;
213
+	pinctrl-0 = <&uart0_pb_pins>;
237
214
 	status = "okay";
238
215
 };
239
216
 
..
..
@@ -243,9 +220,7 @@
243
220
 };
244
221
 
245
222
 &usbphy {
246
-	pinctrl-names = "default";
247
-	pinctrl-0 = <&usb0_id_detect_pin>;
248
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
223
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
249
224
 	usb1_vbus-supply = <&reg_usb1_vbus>;
250
225
 	usb2_vbus-supply = <&reg_usb2_vbus>;
251
226
 	status = "okay";