add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/arch/arm/boot/dts/imx6qdl-icore.dtsi
..
..
@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR X11
1
2
 /*
2
3
  * Copyright (C) 2016 Amarula Solutions B.V.
3
4
  * Copyright (C) 2016 Engicam S.r.l.
4
- *
5
- * This file is dual-licensed: you can use it either under the terms
6
- * of the GPL or the X11 license, at your option. Note that this dual
7
- * licensing only applies to this file, and not this project as a
8
- * whole.
9
- *
10
- *  a) This file is free software; you can redistribute it and/or
11
- *     modify it under the terms of the GNU General Public License
12
- *     version 2 as published by the Free Software Foundation.
13
- *
14
- *     This file is distributed in the hope that it will be useful,
15
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- *     GNU General Public License for more details.
18
- *
19
- * Or, alternatively,
20
- *
21
- *  b) Permission is hereby granted, free of charge, to any person
22
- *     obtaining a copy of this software and associated documentation
23
- *     files (the "Software"), to deal in the Software without
24
- *     restriction, including without limitation the rights to use,
25
- *     copy, modify, merge, publish, distribute, sublicense, and/or
26
- *     sell copies of the Software, and to permit persons to whom the
27
- *     Software is furnished to do so, subject to the following
28
- *     conditions:
29
- *
30
- *     The above copyright notice and this permission notice shall be
31
- *     included in all copies or substantial portions of the Software.
32
- *
33
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40
- *     OTHER DEALINGS IN THE SOFTWARE.
41
5
  */
42
6
 
43
7
 #include <dt-bindings/gpio/gpio.h>
..
..
@@ -46,7 +10,12 @@
46
10
 
47
11
 / {
48
12
 	memory@10000000 {
13
+		device_type = "memory";
49
14
 		reg = <0x10000000 0x80000000>;
15
+	};
16
+
17
+	chosen {
18
+		stdout-path = &uart4;
50
19
 	};
51
20
 
52
21
 	backlight_lvds: backlight-lvds {
..
..
@@ -181,10 +150,23 @@
181
150
 &fec {
182
151
 	pinctrl-names = "default";
183
152
 	pinctrl-0 = <&pinctrl_enet>;
184
-	phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
185
153
 	clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
186
154
 	phy-mode = "rmii";
155
+	phy-handle = <&eth_phy>;
187
156
 	status = "okay";
157
+
158
+	mdio {
159
+		#address-cells = <1>;
160
+		#size-cells = <0>;
161
+
162
+		eth_phy: ethernet-phy@0 {
163
+			compatible = "ethernet-phy-ieee802.3-c22";
164
+			reg = <0>;
165
+			reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
166
+			reset-assert-us = <4000>;
167
+			reset-deassert-us = <4000>;
168
+		};
169
+	};
188
170
 };
189
171
 
190
172
 &gpmi {
..
..
@@ -263,6 +245,7 @@
263
245
 };
264
246
 
265
247
 &pwm3 {
248
+	#pwm-cells = <2>;
266
249
 	pinctrl-names = "default";
267
250
 	pinctrl-0 = <&pinctrl_pwm3>;
268
251
 	status = "okay";
..
..
@@ -310,7 +293,7 @@
310
293
 };
311
294
 
312
295
 &iomuxc {
313
-	pinctrl_audmux: audmux {
296
+	pinctrl_audmux: audmuxgrp {
314
297
 		fsl,pins = <
315
298
 			MX6QDL_PAD_DISP0_DAT20__AUD4_TXC  0x130b0
316
299
 			MX6QDL_PAD_DISP0_DAT21__AUD4_TXD  0x110b0
..
..
@@ -349,7 +332,7 @@
349
332
 		>;
350
333
 	};
351
334
 
352
-	pinctrl_gpmi_nand: gpmi-nand {
335
+	pinctrl_gpmi_nand: gpminandgrp {
353
336
 		fsl,pins = <
354
337
 			MX6QDL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
355
338
 			MX6QDL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
..
..
@@ -415,7 +398,7 @@
415
398
 
416
399
 	pinctrl_usbotg: usbotggrp {
417
400
 		fsl,pins = <
418
-			MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
401
+			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
419
402
 		>;
420
403
 	};
421
404
 
..
..
@@ -427,6 +410,7 @@
427
410
 			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
428
411
 			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
429
412
 			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
413
+			MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0
430
414
 		>;
431
415
 	};
432
416