mirror of
https://github.com/armbian/build.git
synced 2025-08-19 21:41:09 +02:00
fcb85f1767
- merging C2 and Meson family on the source level, C2 is still making own kernels, but sources, patches and configs are the same - merged boot scripts for meson family. support for non existing legacy kernel was dropped from boot scripts, added UUID support, armbianEnv.txt - Meson default remain on 4.14.y, NEXT moved to 4.17.y and DEV remains on master - remove deprecated patches, remove wrong permissions in patches - tested on C2, K2 and Le Potate. USB troubles are still present and common, while K2 and Lepotato might have boot/reboot troubles on 4.16+ - boards configuration cleanup - moving K2 to the supported list. It's the same level of support as Le Potato
125 lines
3.5 KiB
Diff
125 lines
3.5 KiB
Diff
From b4c1945b42249be62069158070f6a7ef6c6c7508 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Wed, 20 Sep 2017 17:22:47 +0200
|
|
Subject: [PATCH 28/39] ARM64: dts: meson-gx: add audio controller nodes
|
|
|
|
Add audio controller nodes for Amlogic meson gxl.
|
|
This includes the audio-core node, the i2s DAI and i2s
|
|
aiu DMAs.
|
|
|
|
Audio on this SoC family is still a work in progress. More nodes are likely
|
|
to be added later on (pcm DAIs, input DMAs, SPDIF etc ...)
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 22 ++++++++++++++++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 23 +++++++++++++++++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 23 +++++++++++++++++++++++
|
|
3 files changed, 68 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
index 4ee2e79..6a7e0df 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
|
@@ -233,6 +233,28 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
+ audio: audio@5400 {
|
|
+ compatible = "amlogic,meson-audio-core";
|
|
+ reg = <0x0 0x5400 0x0 0x2ac>,
|
|
+ <0x0 0xa000 0x0 0x304>;
|
|
+ reg-names = "aiu", "audin";
|
|
+ status = "disabled";
|
|
+
|
|
+ aiu_i2s_dma: aiu_i2s_dma {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "amlogic,meson-aiu-i2s-dma";
|
|
+ interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ i2s_dai: i2s_dai {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "amlogic,meson-i2s-dai";
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ };
|
|
+
|
|
uart_A: serial@84c0 {
|
|
compatible = "amlogic,meson-gx-uart";
|
|
reg = <0x0 0x84c0 0x0 0x18>;
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
index 3290a4d..421d34f 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
@@ -736,6 +736,29 @@
|
|
<0>; /* Do Nothing */
|
|
};
|
|
|
|
+&audio {
|
|
+ clocks = <&clkc CLKID_AIU>,
|
|
+ <&clkc CLKID_AIU_GLUE>,
|
|
+ <&clkc CLKID_I2S_SPDIF>;
|
|
+ clock-names = "aiu_top", "aiu_glue", "audin";
|
|
+ resets = <&reset RESET_AIU>,
|
|
+ <&reset RESET_AUDIN>;
|
|
+ reset-names = "aiu", "audin";
|
|
+};
|
|
+
|
|
+&aiu_i2s_dma {
|
|
+ clocks = <&clkc CLKID_I2S_OUT>;
|
|
+ clock-names = "fast";
|
|
+};
|
|
+
|
|
+&i2s_dai {
|
|
+ clocks = <&clkc CLKID_I2S_OUT>,
|
|
+ <&clkc CLKID_MIXER_IFACE>,
|
|
+ <&clkc CLKID_AOCLK_GATE>,
|
|
+ <&clkc CLKID_CTS_AMCLK>;
|
|
+ clock-names = "fast", "iface", "bclks", "mclk";
|
|
+};
|
|
+
|
|
&saradc {
|
|
compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc";
|
|
clocks = <&xtal>,
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
index c851411..28d4476 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
@@ -687,6 +687,29 @@
|
|
<0>; /* Do Nothing */
|
|
};
|
|
|
|
+&audio {
|
|
+ clocks = <&clkc CLKID_AIU>,
|
|
+ <&clkc CLKID_AIU_GLUE>,
|
|
+ <&clkc CLKID_I2S_SPDIF>;
|
|
+ clock-names = "aiu_top", "aiu_glue", "audin";
|
|
+ resets = <&reset RESET_AIU>,
|
|
+ <&reset RESET_AUDIN>;
|
|
+ reset-names = "aiu", "audin";
|
|
+};
|
|
+
|
|
+&aiu_i2s_dma {
|
|
+ clocks = <&clkc CLKID_I2S_OUT>;
|
|
+ clock-names = "fast";
|
|
+};
|
|
+
|
|
+&i2s_dai {
|
|
+ clocks = <&clkc CLKID_I2S_OUT>,
|
|
+ <&clkc CLKID_MIXER_IFACE>,
|
|
+ <&clkc CLKID_AOCLK_GATE>,
|
|
+ <&clkc CLKID_CTS_AMCLK>;
|
|
+ clock-names = "fast", "iface", "bclks", "mclk";
|
|
+};
|
|
+
|
|
&saradc {
|
|
compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";
|
|
clocks = <&xtal>,
|
|
--
|
|
2.7.4
|
|
|