forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390 
 kernel/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
....@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
12 /*
2
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
3
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
34  *
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 as
11
- *     published by the Free Software Foundation; either version 2 of the
12
- *     License, or (at your option) any later version.
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.
415  */
426 
437 #include "rk3399-sapphire.dtsi"
....@@ -46,23 +10,34 @@
4610 	compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399";
4711 
4812 	rt5651_sound: rt5651-sound {
49
-		compatible = "simple-audio-card";
50
-		simple-audio-card,format = "i2s";
51
-		simple-audio-card,name = "realtek,rt5651-codec";
52
-		simple-audio-card,mclk-fs = <256>;
53
-		simple-audio-card,widgets =
54
-			"Microphone", "Mic Jack",
55
-			"Headphone", "Headphone Jack";
56
-		simple-audio-card,routing =
57
-			"Mic Jack", "MICBIAS1",
58
-			"IN1P", "Mic Jack",
59
-			"Headphone Jack", "HPOL",
60
-			"Headphone Jack", "HPOR";
61
-		simple-audio-card,cpu {
62
-			sound-dai = <&i2s0>;
63
-		};
64
-		simple-audio-card,codec {
65
-			sound-dai = <&rt5651>;
13
+		status = "okay";
14
+		compatible = "rockchip,multicodecs-card";
15
+		rockchip,card-name = "realtek,rt5651-codec";
16
+		keyup-threshold-microvolt = <1800000>;
17
+		poll-interval = <100>;
18
+		spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
19
+		hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_HIGH>;
20
+		rockchip,format = "i2s";
21
+		rockchip,mclk-fs = <256>;
22
+		rockchip,cpu = <&i2s0>;
23
+		rockchip,codec = <&rt5651>;
24
+		rockchip,audio-routing =
25
+			"Headphone", "HPOL",
26
+			"Headphone", "HPOR",
27
+			"Speaker", "HPOL",
28
+			"Speaker", "HPOR",
29
+			"Headphone", "Headphone Power",
30
+			"Headphone", "Headphone Power",
31
+			"Speaker", "Speaker Power",
32
+			"Speaker", "Speaker Power",
33
+			"IN1P", "Main Mic",
34
+			"IN2P", "Headset Mic",
35
+			"IN2N", "Headset Mic",
36
+			"Headset Mic", "micbias1";
37
+		play-pause-key {
38
+			label = "playpause";
39
+			linux,code = <KEY_PLAYPAUSE>;
40
+			press-threshold-microvolt = <2000>;
6641 		};
6742 	};
6843 
....@@ -106,6 +81,7 @@
10681 		wifi_chip_type = "ap6354";
10782 		sdio_vref = <1800>;
10883 		WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */
84
+		WIFI,poweren_gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
10985 		status = "okay";
11086 	};
11187 
....@@ -187,8 +163,6 @@
187163 		clock-names = "mclk";
188164 		pinctrl-names = "default";
189165 		pinctrl-0 = <&i2s_8ch_mclk>;
190
-		spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
191
-		hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>;
192166 	};
193167 };
194168 
....@@ -250,7 +224,8 @@
250224 
251225 &sdio0 {
252226 	max-frequency = <100000000>;
253
-	supports-sdio;
227
+	no-sd;
228
+	no-mmc;
254229 	bus-width = <4>;
255230 	disable-wp;
256231 	cap-sd-highspeed;