mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-24 05:48:41 +00:00
03f380178d
* Move Meson64 to 5.6.y * Move Meson64 U-boot to 2020.04 Tested on Odroid C2 * Merge, replace and update patches from Khadas branch
109 lines
2.5 KiB
Diff
109 lines
2.5 KiB
Diff
From 3209810b2baa64c431a115116d7cde1f440efd2e Mon Sep 17 00:00:00 2001
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
Date: Wed, 19 Feb 2020 04:27:30 +0000
|
|
Subject: [PATCH 052/101] WIP: arm64: dts: meson: add audio playback to khadas
|
|
vim2
|
|
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
---
|
|
.../dts/amlogic/meson-gxm-khadas-vim2.dts | 70 +++++++++++++++++++
|
|
1 file changed, 70 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
index d5dc12878dfe..dfa2abc55918 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
@@ -8,6 +8,7 @@
|
|
/dts-v1/;
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
+#include <dt-bindings/sound/meson-aiu.h>
|
|
#include <dt-bindings/thermal/thermal.h>
|
|
|
|
#include "meson-gxm.dtsi"
|
|
@@ -25,6 +26,13 @@
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
|
|
+ dio2133: analog-amplifier {
|
|
+ compatible = "simple-audio-amplifier";
|
|
+ sound-name-prefix = "AU2";
|
|
+ VCC-supply = <&hdmi_5v>;
|
|
+ enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
|
|
+ };
|
|
+
|
|
memory@0 {
|
|
device_type = "memory";
|
|
reg = <0x0 0x0 0x0 0x80000000>;
|
|
@@ -189,6 +197,68 @@
|
|
clock-frequency = <32768>;
|
|
pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
|
|
};
|
|
+
|
|
+ sound {
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
+ model = "GXM-KHADAS-VIM2";
|
|
+ audio-aux-devs = <&dio2133>;
|
|
+ audio-widgets = "Line", "Lineout";
|
|
+ audio-routing = "AU2 INL", "ACODEC LOLN",
|
|
+ "AU2 INR", "ACODEC LORN",
|
|
+ "Lineout", "AU2 OUTL",
|
|
+ "Lineout", "AU2 OUTR";
|
|
+ assigned-clocks = <&clkc CLKID_MPLL2>,
|
|
+ <&clkc CLKID_MPLL0>,
|
|
+ <&clkc CLKID_MPLL1>;
|
|
+ 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_I2S_ENCODER>;
|
|
+ dai-format = "i2s";
|
|
+ mclk-fs = <512>;
|
|
+
|
|
+ codec-0 {
|
|
+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
|
|
+ };
|
|
+
|
|
+ codec-1 {
|
|
+ sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ dai-link-2 {
|
|
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
|
|
+
|
|
+ codec-0 {
|
|
+ sound-dai = <&hdmi_tx>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ dai-link-3 {
|
|
+ sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;
|
|
+
|
|
+ codec-0 {
|
|
+ sound-dai = <&acodec>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&acodec {
|
|
+ AVDD-supply = <&vddio_ao18>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&aiu {
|
|
+ status = "okay";
|
|
};
|
|
|
|
&cec_AO {
|
|
--
|
|
2.17.1
|
|
|