mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
99f6bef7de
* Attach Meson64 CURRENT to 5.6.y and make DEV = CURRENT at this point. There is a lot of changes to 5.7.y and can be done after release or by someone that feels a need for this right now. * Delete meson64_fclk_div3.patch this fix has been upstream for some time, I had issues with it on 5.4, which is why it had been removed there. * [ meson64 current ] kconfig tweak disable Rockchip SoC drivers * [ meson64 current ] remove rockchip patches * [ meson64 current ] disable CMA patch GX * [ meson64 current] add libretech cc audio patch This brings the dts even with the khilman 5.8/integ branch which includes all of the audio changes. The kernel is registering audio devices, however nothing comes out. committed in case someone wants to spend time debugging/testing theories. * fix permissions was editing from another machine, accidental change of permissions in the patch * Set default mixer settings Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * [ meson64 current ] GXL audio commit This moves to the mainline patches and covers le potato and la frite. Adjusted asound config to handle a commonized sound card name. * [ meson64 current ] add gxbb audio WIP Playback is too fast, a clock setting is off somewhere. * Update kernel configs Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> Co-authored-by: Tony <tonymckahan@gmail.com>
99 lines
2.8 KiB
Diff
99 lines
2.8 KiB
Diff
From 884f16bf7d65d4666b0ee2b381a6adc810b0584d Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Tue, 22 Oct 2019 18:15:43 +0200
|
|
Subject: [PATCH 049/101] WIP: arm64: dts: meson-gx: add playback audio devices
|
|
|
|
FIXME: Missing gxbb ATM
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 +++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 34 ++++++++++++++++++++++
|
|
2 files changed, 47 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
index 40db06e28b66..962a56e0e8b4 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
@@ -226,6 +226,17 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
+ aiu: audio-controller@5400 {
|
|
+ compatible = "amlogic,aiu";
|
|
+ #sound-dai-cells = <2>;
|
|
+ sound-name-prefix = "AIU";
|
|
+ reg = <0x0 0x5400 0x0 0x2ac>;
|
|
+ interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>,
|
|
+ <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
|
|
+ interrupt-names = "i2s", "spdif";
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
uart_A: serial@84c0 {
|
|
compatible = "amlogic,meson-gx-uart";
|
|
reg = <0x0 0x84c0 0x0 0x18>;
|
|
@@ -574,6 +585,8 @@
|
|
interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
+ #sound-dai-cells = <0>;
|
|
+ sound-name-prefix = "HDMITX";
|
|
status = "disabled";
|
|
|
|
/* VPU VENC Input */
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
index 259d86399390..ec50e93470f9 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
@@ -14,6 +14,17 @@
|
|
compatible = "amlogic,meson-gxl";
|
|
|
|
soc {
|
|
+ acodec: audio-controller@c8832000 {
|
|
+ compatible = "amlogic,t9015";
|
|
+ reg = <0x0 0xc8832000 0x0 0x14>;
|
|
+ #sound-dai-cells = <0>;
|
|
+ sound-name-prefix = "ACODEC";
|
|
+ clocks = <&clkc CLKID_ACODEC>;
|
|
+ clock-names = "pclk";
|
|
+ resets = <&reset RESET_ACODEC>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
usb0: usb@c9000000 {
|
|
status = "disabled";
|
|
compatible = "amlogic,meson-gxl-dwc3";
|
|
@@ -49,6 +60,29 @@
|
|
};
|
|
};
|
|
|
|
+&aiu {
|
|
+ compatible = "amlogic,aiu-gxl", "amlogic,aiu";
|
|
+ clocks = <&clkc CLKID_AIU_GLUE>,
|
|
+ <&clkc CLKID_I2S_OUT>,
|
|
+ <&clkc CLKID_AOCLK_GATE>,
|
|
+ <&clkc CLKID_CTS_AMCLK>,
|
|
+ <&clkc CLKID_MIXER_IFACE>,
|
|
+ <&clkc CLKID_IEC958>,
|
|
+ <&clkc CLKID_IEC958_GATE>,
|
|
+ <&clkc CLKID_CTS_MCLK_I958>,
|
|
+ <&clkc CLKID_CTS_I958>;
|
|
+ clock-names = "pclk",
|
|
+ "i2s_pclk",
|
|
+ "i2s_aoclk",
|
|
+ "i2s_mclk",
|
|
+ "i2s_mixer",
|
|
+ "spdif_pclk",
|
|
+ "spdif_aoclk",
|
|
+ "spdif_mclk",
|
|
+ "spdif_mclk_sel";
|
|
+ resets = <&reset RESET_AIU>;
|
|
+};
|
|
+
|
|
&apb {
|
|
usb2_phy0: phy@78000 {
|
|
compatible = "amlogic,meson-gxl-usb2-phy";
|
|
--
|
|
2.17.1
|
|
|