mirror of
https://github.com/armbian/build.git
synced 2025-08-19 21:41:09 +02: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>
246 lines
5.8 KiB
Diff
Executable File
246 lines
5.8 KiB
Diff
Executable File
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
index 0cb40326b0d3..234490d3ee68 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
|
@@ -60,6 +60,29 @@ usb1: usb@c9100000 {
|
|
};
|
|
};
|
|
|
|
+&aiu {
|
|
+ compatible = "amlogic,aiu-gxbb", "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>;
|
|
+};
|
|
+
|
|
&aobus {
|
|
pinctrl_aobus: pinctrl@14 {
|
|
compatible = "amlogic,meson-gxbb-aobus-pinctrl";
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
index 259d86399390..d9f00c5a9a5c 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
|
@@ -49,6 +49,29 @@ crypto: crypto@c883e000 {
|
|
};
|
|
};
|
|
|
|
+&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";
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
|
|
index e8348b2728db..4c9dded836e2 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
|
|
@@ -8,6 +8,7 @@
|
|
/dts-v1/;
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
+#include <dt-bindings/sound/meson-aiu.h>
|
|
|
|
#include "meson-gxl-s905x.dtsi"
|
|
|
|
@@ -124,6 +125,45 @@ vddio_boot: regulator-vddio_boot {
|
|
regulator-max-microvolt = <1800000>;
|
|
vin-supply = <&vcc_3v3>;
|
|
};
|
|
+
|
|
+ sound {
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
+ model = "GX-SOUND-CARD";
|
|
+ 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 {
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
|
|
index 4d5949496596..3f35331c1652 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
|
|
@@ -8,6 +8,7 @@
|
|
/dts-v1/;
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
+#include <dt-bindings/sound/meson-aiu.h>
|
|
|
|
#include "meson-gxl-s905x.dtsi"
|
|
|
|
@@ -105,6 +106,45 @@ vddio_boot: regulator-vddio_boot {
|
|
vin-supply = <&vcc_3v3>;
|
|
regulator-always-on;
|
|
};
|
|
+
|
|
+ sound {
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
+ model = "GX-SOUND-CARD";
|
|
+ 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 {
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
|
|
index 248b018c83d5..f1dec81d347b 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
|
|
@@ -8,6 +8,7 @@
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
#include <dt-bindings/leds/common.h>
|
|
+#include <dt-bindings/sound/meson-aiu.h>
|
|
|
|
/ {
|
|
adc-keys {
|
|
@@ -175,6 +176,45 @@ vddio_card: regulator-vddio-card {
|
|
regulator-settling-time-up-us = <200>;
|
|
regulator-settling-time-down-us = <50000>;
|
|
};
|
|
+
|
|
+ sound {
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
+ model = "GX-SOUND-CARD";
|
|
+ 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 {
|