forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf 
 kernel/arch/arm/boot/dts/imx51-zii-rdu1.dts
....@@ -1,42 +1,6 @@
1
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
12 /*
23  * Copyright (C) 2017 Zodiac Inflight Innovations
3
- *
4
- * This file is dual-licensed: you can use it either under the terms
5
- * of the GPL or the X11 license, at your option. Note that this dual
6
- * licensing only applies to this file, and not this project as a
7
- * whole.
8
- *
9
- *  a) This file is free software; you can redistribute it and/or
10
- *     modify it under the terms of the GNU General Public License
11
- *     version 2 as published by the Free Software Foundation.
12
- *
13
- *     This file is distributed in the hope that it will be useful,
14
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- *     GNU General Public License for more details.
17
- *
18
- * Or, alternatively,
19
- *
20
- *  b) Permission is hereby granted, free of charge, to any person
21
- *     obtaining a copy of this software and associated documentation
22
- *     files (the "Software"), to deal in the Software without
23
- *     restriction, including without limitation the rights to use,
24
- *     copy, modify, merge, publish, distribute, sublicense, and/or
25
- *     sell copies of the Software, and to permit persons to whom the
26
- *     Software is furnished to do so, subject to the following
27
- *     conditions:
28
- *
29
- *     The above copyright notice and this permission notice shall be
30
- *     included in all copies or substantial portions of the Software.
31
- *
32
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND,
33
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
34
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
35
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
39
- *     OTHER DEALINGS IN THE SOFTWARE.
404  */
415 
426 /dts-v1/;
....@@ -253,8 +217,8 @@
253217 		simple-audio-card,widgets =
254218 			"Headphone", "Headphone Jack";
255219 		simple-audio-card,routing =
256
-			"Headphone Jack", "HPLEFT",
257
-			"Headphone Jack", "HPRIGHT";
220
+			"Headphone Jack", "TPA6130A2 HPLEFT",
221
+			"Headphone Jack", "TPA6130A2 HPRIGHT";
258222 		simple-audio-card,aux-devs = <&hpa1>;
259223 
260224 		sound_cpu: simple-audio-card,cpu {
....@@ -502,16 +466,11 @@
502466 	pinctrl-0 = <&pinctrl_i2c2>;
503467 	status = "okay";
504468 
505
-	eeprom@50 {
506
-		compatible = "atmel,24c04";
507
-		pagesize = <16>;
508
-		reg = <0x50>;
509
-	};
510
-
511469 	hpa1: amp@60 {
512470 		compatible = "ti,tpa6130a2";
513471 		reg = <0x60>;
514472 		Vdd-supply = <&reg_3p3v>;
473
+		sound-name-prefix = "TPA6130A2";
515474 	};
516475 
517476 	ds1341: rtc@68 {