From: Christian Hewitt <christianshewitt@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Kevin Hilman <khilman@baylibre.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Christian Hewitt <christianshewitt@gmail.com>
Subject: [PATCH 02/12] arm64: dts: meson: add audio playback to khadas-vim2
Date: Sat, 18 Jul 2020 06:57:29 +0000 [thread overview]
Message-ID: <20200718065739.7802-3-christianshewitt@gmail.com> (raw)
In-Reply-To: <20200718065739.7802-1-christianshewitt@gmail.com>
Add initial audio support limited to HDMI i2s.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
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 bff8ec2c1c70..d4734220443c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
@@ -7,9 +7,9 @@
/dts-v1/;
-#include <dt-bindings/input/input.h>
-
#include "meson-gxm.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/sound/meson-aiu.h>
/ {
compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm";
@@ -145,6 +145,45 @@
clock-frequency = <32768>;
pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
};
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXM-KHADAS-VIM2";
+ 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_I2S_ENCODER>;
+ dai-format = "i2s";
+ mclk-fs = <256>;
+
+ codec-0 {
+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
+ };
+ };
+
+ dai-link-2 {
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
+
+ codec-0 {
+ sound-dai = <&hdmi_tx>;
+ };
+ };
+ };
+};
+
+&aiu {
+ status = "okay";
};
&cec_AO {
@@ -154,7 +193,6 @@
hdmi-phandle = <&hdmi_tx>;
};
-
&cpu_cooling_maps {
map0 {
cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
--
2.17.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2020-07-18 6:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 6:57 [PATCH 00/12] arm64: dts: meson: add more GX soundcards Christian Hewitt
2020-07-18 6:57 ` [PATCH 01/12] arm64: dts: meson: add audio playback to a95x Christian Hewitt
2020-07-18 6:57 ` Christian Hewitt [this message]
2020-07-18 6:57 ` [PATCH 03/12] arm64: dts: meson: add audio playback to nanopi-k2 Christian Hewitt
2020-07-18 6:57 ` [PATCH 04/12] arm64: dts: meson: add audio playback to nexbox-a1 Christian Hewitt
2020-07-21 8:18 ` Jerome Brunet
2020-07-18 6:57 ` [PATCH 05/12] arm64: dts: meson: add audio playback to odroid-c2 Christian Hewitt
2020-07-18 6:57 ` [PATCH 06/12] arm64: dts: meson: add audio playback to p201 Christian Hewitt
2020-07-18 6:57 ` [PATCH 07/12] arm64: dts: meson: add audio playback to p200 Christian Hewitt
2020-07-18 6:57 ` [PATCH 08/12] arm64: dts: meson: add audio playback to p212-s905x dtsi Christian Hewitt
2020-07-18 6:57 ` [PATCH 09/12] arm64: dts: meson: add audio playback to rbox-pro Christian Hewitt
2020-07-21 8:21 ` Jerome Brunet
2020-07-18 6:57 ` [PATCH 10/12] arm64: dts: meson: add audio playback to vega-s95 dtsi Christian Hewitt
2020-07-18 6:57 ` [PATCH 11/12] arm64: dts: meson: add audio playback to wetek-hub Christian Hewitt
2020-07-18 6:57 ` [PATCH 12/12] arm64: dts: meson: add audio playback to wetek-play2 Christian Hewitt
2020-07-21 8:39 ` [PATCH 00/12] arm64: dts: meson: add more GX soundcards Jerome Brunet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200718065739.7802-3-christianshewitt@gmail.com \
--to=christianshewitt@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).