microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Amlogic ARM64 DT changes for v5.15 part 2: 

- add audio to nodes vega-s95
 - add audio to nodes nexbox-a1
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmEWfZUACgkQd9zb2sjI
 SdFznA/+Ou5ss4Iuzk5Nnxxv8S386+6t9ThRsvZCH971EWzqrq9i3X/z2fO1+9J6
 OqMZhUB9VjEKhsn3dsM4uYGu0uVJYUPProAP9g2tcnHXxUDEshEzTSJXNYNldFoL
 3xJ1g3gGDEkslrhqmWYy9FPnhpvfRu0u6QTv8KncBEqinkQnLqplbVkLUbsNZJAm
 aa5vJdfksVHO90KXyGOy2o28hqZDR9DxigsA6NVLqaqW6/R4gUApLZEO0ONtC6Nu
 4GSldPuRt/XmjsERuBNthdRuro5R+GpSasDcAQOWDDVQttmrrBHy9lpCyJzAx5sj
 7wn/fHUDw+gIjUwhHl1ChVhUWp/NYRUDX844lPyQXkXMgxVwnTSCZClv0Q22hV8F
 nHODhNlJTMlysFTywRTCgtsUiZOS8IYsbd/MQlu0G2qYF+Ake4VnJ/R/HMNK9PzW
 eM53h7bBA2qTsxXqnUGnCO6VDq33SEUdAxXXskSd2UEn+2CaFVWO9jiB/gNXXeBU
 XotuV3ksO7c0oYnTS5bUQuhw9gkK93lsg+XmwMbYeGyW5kJ7uZds2v4hPTQxHZnv
 VafFryQS7xeGmWVjE5deq6GW8Ba1kqWmHukY4TLHGqPIctyzoghYf0iaLoITMF7B
 ccfj66/RnMo6bgnOJLK2HJQ2lIza99qBvtSqmsJTf1y6I2RaYbw=
 =KfXM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmEa0F4ACgkQmmx57+YA
 GNmVAA//UdMuXmFidiXOH3VY4GLPtmzIDLounnMqI0k1F/x9OY0IPQTfB1euu/D2
 JC/YweqRXZhqn1E2PFMrsTBFOTTdByCbW0esz/Sq0VIO7vVoLghs6/3TZhjFkxWG
 Z2GvCVDcQLoMcD9Yi79UvhU255M6anSpZjMHDc9GSNFCUnvaSizjMyXtHrrxNZXg
 ZUd2OuCvji0h79WveLP8MLU91rQidP28jL+YTl7a3JdsBG7BKbinnoM3AnBj7bWr
 F/QVeTXrN6AIUeVeXiyACoOBK4BQSJLVQhgDHoAHV1xqHjkQ+360LKkAwDxNqoZl
 lobTYPhRaMnpOBUQbjxBeF3O+YvvGkBI9wVCO/1cV8Tm+E8ZkgPvYTIf7uQZDwld
 tGzRs0pcn1Rby2RHnsgB4++XrR10v4OASMSoy+MLk0yxAr3q39PmO/PPYm9VSAo4
 YqHCPPIZXv3LD7pfRKGVobX0l89S0GsWreYg2jgDK54sBRoEV04CxhfWDuZr1xCl
 bBOiVRI+1nrR50/07gJs3yyw27Bicp3gayN9S6+SgppjYucRawJb5bpfQ9Q51dmx
 vQdnb86/mOefE0bGNnaWx13n6SYZo1ENeAgcJ4n+dysiFnYW2M1MHo3DB6MsDE72
 LjZXu0c9tJBDNTY/i6bVT9qQ6ajFoGpRLO9s1f1JUJQMSuZKPuI=
 =WKc3
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-arm64-dt-for-v5.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.15 part 2:
- add audio to nodes vega-s95
- add audio to nodes nexbox-a1

* tag 'amlogic-arm64-dt-for-v5.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: add audio playback to vega-s95 dtsi
  arm64: dts: meson: add audio playback to nexbox-a1

Link: https://lore.kernel.org/r/47d77095-eee7-bbd9-d3aa-1dabeea3f0b9@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-08-16 22:53:49 +02:00
Родитель d5aa024586 c6cf488e3b
Коммит fba65f104e
2 изменённых файлов: 122 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

61
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
Просмотреть файл

@ -4,6 +4,7 @@
*/
#include "meson-gxbb.dtsi"
#include <dt-bindings/sound/meson-aiu.h>
/ {
compatible = "tronsmart,vega-s95", "amlogic,meson-gxbb";
@ -17,6 +18,13 @@
stdout-path = "serial0:115200n8";
};
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};
leds {
compatible = "gpio-leds";
@ -97,6 +105,59 @@
clocks = <&wifi32k>;
clock-names = "ext_clock";
};
sound {
compatible = "amlogic,gx-sound-card";
model = "VEGA-S95";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
assigned-clock-parents = <0>, <0>, <0>;
assigned-clock-rates = <294912000>,
<270950400>,
<393216000>;
status = "okay";
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
};
dai-link-1 {
sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;
};
dai-link-2 {
sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
dai-format = "i2s";
mclk-fs = <256>;
codec-0 {
sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
};
};
dai-link-3 {
sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;
codec-0 {
sound-dai = <&spdif_dit>;
};
};
dai-link-4 {
sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
codec-0 {
sound-dai = <&hdmi_tx>;
};
};
};
};
&aiu {
status = "okay";
pinctrl-0 = <&spdif_out_y_pins>;
pinctrl-names = "default";
};
&cec_AO {

61
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
Просмотреть файл

@ -10,6 +10,7 @@
/dts-v1/;
#include "meson-gxm.dtsi"
#include <dt-bindings/sound/meson-aiu.h>
/ {
compatible = "nexbox,a1", "amlogic,s912", "amlogic,meson-gxm";
@ -24,6 +25,13 @@
stdout-path = "serial0:115200n8";
};
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>;
@ -75,6 +83,59 @@
};
};
};
sound {
compatible = "amlogic,gx-sound-card";
model = "NEXBOX-A1";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
assigned-clock-parents = <0>, <0>, <0>;
assigned-clock-rates = <294912000>,
<270950400>,
<393216000>;
status = "okay";
dai-link-0 {
sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
};
dai-link-1 {
sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;
};
dai-link-2 {
sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
dai-format = "i2s";
mclk-fs = <256>;
codec-0 {
sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
};
};
dai-link-3 {
sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;
codec-0 {
sound-dai = <&spdif_dit>;
};
};
dai-link-4 {
sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
codec-0 {
sound-dai = <&hdmi_tx>;
};
};
};
};
&aiu {
status = "okay";
pinctrl-0 = <&spdif_out_h_pins>;
pinctrl-names = "default";
};
&cec_AO {