2023-04-01 13:29:41 +00:00
|
|
|
From a2fc22db011ab46d8485ca831bb4c4e723e11225 Mon Sep 17 00:00:00 2001
|
2023-03-09 18:05:06 +00:00
|
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
|
|
Date: Fri, 10 Feb 2023 02:29:00 +0000
|
2023-04-01 13:29:41 +00:00
|
|
|
Subject: [PATCH] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add initial
|
|
|
|
audio support
|
2023-03-09 18:05:06 +00:00
|
|
|
|
|
|
|
Add initial support for HDMI and S/PDIF audio output.
|
|
|
|
|
|
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
2023-04-01 13:29:41 +00:00
|
|
|
Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
|
|
|
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
|
2023-03-09 18:05:06 +00:00
|
|
|
---
|
2023-04-01 13:29:41 +00:00
|
|
|
.../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 60 +++++++++++++++++++
|
|
|
|
1 file changed, 60 insertions(+)
|
2023-03-09 18:05:06 +00:00
|
|
|
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
|
2023-04-01 13:29:41 +00:00
|
|
|
index a800e8955c4a3e..e238f1f1012419 100644
|
2023-03-09 18:05:06 +00:00
|
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
|
|
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
|
|
|
|
@@ -9,11 +9,19 @@
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
|
|
#include <dt-bindings/leds/common.h>
|
|
|
|
+#include <dt-bindings/sound/meson-aiu.h>
|
|
|
|
|
|
|
|
/ {
|
|
|
|
compatible = "videostrong,kii-pro", "amlogic,meson-gxbb";
|
|
|
|
model = "Videostrong KII Pro";
|
|
|
|
|
|
|
|
+ spdif_dit: audio-codec-0 {
|
|
|
|
+ #sound-dai-cells = <0>;
|
|
|
|
+ compatible = "linux,spdif-dit";
|
|
|
|
+ status = "okay";
|
|
|
|
+ sound-name-prefix = "DIT";
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
leds {
|
|
|
|
compatible = "gpio-leds";
|
2023-04-01 13:29:41 +00:00
|
|
|
led {
|
|
|
|
@@ -34,6 +42,58 @@
|
2023-03-09 18:05:06 +00:00
|
|
|
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
+
|
|
|
|
+ sound {
|
|
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
|
|
+ model = "KII-PRO";
|
|
|
|
+ assigned-clocks = <&clkc CLKID_MPLL0>,
|
|
|
|
+ <&clkc CLKID_MPLL1>,
|
|
|
|
+ <&clkc CLKID_MPLL2>;
|
|
|
|
+ assigned-clock-parents = <0>, <0>, <0>;
|
|
|
|
+ assigned-clock-rates = <294912000>,
|
|
|
|
+ <270950400>,
|
|
|
|
+ <393216000>;
|
|
|
|
+
|
|
|
|
+ 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";
|
|
|
|
};
|
|
|
|
|
|
|
|
ðmac {
|
|
|
|
|