Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use upstream ODROID N2+ support and CDC ACM cooldown fix #948

Merged
merged 1 commit into from
Nov 2, 2020
Merged

Use upstream ODROID N2+ support and CDC ACM cooldown fix #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 0 additions & 132 deletions ...t-external/board/hardkernel/patches/linux/0001-Revert-cdc-acm-introduce-a-cool-down.patch
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions ...board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From e2b93751cfd0722801b65b4603b588ab9df4c12b Mon Sep 17 00:00:00 2001
From 59bbf3567b02c36edfa4ee013d7e7e8c492756f2 Mon Sep 17 00:00:00 2001
Message-Id: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Tue, 21 Apr 2020 18:39:30 +0200
Subject: [PATCH 2/8] arm64: defconfig: enable meson gx audio as module
Subject: [PATCH 01/14] arm64: defconfig: enable meson gx audio as module

Enable the module config for the Amlogic GX audio card.
This module will imply the internal components usually associated
Expand Down Expand Up @@ -39,5 +40,5 @@ index 03d0189f7d68..ceb60ee9c340 100644
CONFIG_SND_SOC_WCD934X=m
CONFIG_SND_SOC_WSA881X=m
--
2.17.1
2.29.1

9 changes: 6 additions & 3 deletions .../board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
From 821b8ac21b1675910423ee69d37cb1977b8f271e Mon Sep 17 00:00:00 2001
From 4684d42cbbbb2d0331eb273229c9856a09b8d687 Mon Sep 17 00:00:00 2001
Message-Id: <4684d42cbbbb2d0331eb273229c9856a09b8d687.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Mon, 30 Mar 2020 17:39:04 +0200
Subject: [PATCH 3/8] ASoC: meson: imply acodec glue on axg sound card
Subject: [PATCH 02/14] ASoC: meson: imply acodec glue on axg sound card

When axg card driver support is enabled, lets enable the related
internal DAC glue by default.
Expand All @@ -24,5 +27,5 @@ index 8b6295283989..363dc3b1bbe4 100644
help
Select Y or M to add support for the AXG SoC sound card
--
2.17.1
2.29.1

9 changes: 6 additions & 3 deletions ...rnal/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
From 60164df03c6314d8f5f3afef56b0bf97962ec9ee Mon Sep 17 00:00:00 2001
From 07eb6dcfc912281b3c4ad598d8cfd3b7548fc965 Mon Sep 17 00:00:00 2001
Message-Id: <07eb6dcfc912281b3c4ad598d8cfd3b7548fc965.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Mon, 24 Feb 2020 14:35:17 +0100
Subject: [PATCH 4/8] ASoC: meson: gx-card: fix sound-dai dt schema
Subject: [PATCH 03/14] ASoC: meson: gx-card: fix sound-dai dt schema

There is a fair amount of warnings when running 'make dtbs_check' with
amlogic,gx-sound-card.yaml.
Expand Down Expand Up @@ -43,5 +46,5 @@ index fb374c659be1..a48222e8cd08 100644

required:
--
2.17.1
2.29.1

11 changes: 7 additions & 4 deletions ...t-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
From e128dd1ca079c5ee558ab100387d9f81bd4f3980 Mon Sep 17 00:00:00 2001
From 5f7bab7b52bc68738dd23af62a085dcc45c22f79 Mon Sep 17 00:00:00 2001
Message-Id: <5f7bab7b52bc68738dd23af62a085dcc45c22f79.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 7 May 2020 00:16:55 +0200
Subject: [PATCH 5/8] arm64: dts: meson: g12: add internal DAC
Subject: [PATCH 04/14] arm64: dts: meson: g12: add internal DAC

add internal audio DAC support on the g12 and sm1 SoC family

Expand All @@ -16,7 +19,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot
index c0aef7d69117..593a006f4b7b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -250,6 +250,17 @@
@@ -250,6 +250,17 @@ hwrng: rng@218 {
};
};

Expand All @@ -35,5 +38,5 @@ index c0aef7d69117..593a006f4b7b 100644
compatible = "simple-bus";
reg = <0x0 0x34400 0x0 0x400>;
--
2.17.1
2.29.1

11 changes: 7 additions & 4 deletions ...ernal/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
From 5ea4085da165fd3f3aa211cb3664dd166d0d5fd7 Mon Sep 17 00:00:00 2001
From e7d1f61513cfe9d2557fbd0ac981a3ecaab9bc70 Mon Sep 17 00:00:00 2001
Message-Id: <e7d1f61513cfe9d2557fbd0ac981a3ecaab9bc70.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 7 May 2020 00:16:56 +0200
Subject: [PATCH 6/8] arm64: dts: meson: g12: add internal DAC glue
Subject: [PATCH 05/14] arm64: dts: meson: g12: add internal DAC glue

add the internal DAC glue support on the g12 and sm1 family
This glue connects the different TDM interfaces of the SoC to
Expand All @@ -18,7 +21,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/am
index 55d39020ec72..0d14409f509c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
@@ -343,6 +343,15 @@
@@ -343,6 +343,15 @@ spdifout_b: audio-controller@680 {
status = "disabled";
};

Expand All @@ -35,5 +38,5 @@ index 55d39020ec72..0d14409f509c 100644
compatible = "amlogic,g12a-tohdmitx";
reg = <0x0 0x744 0x0 0x4>;
--
2.17.1
2.29.1

20 changes: 12 additions & 8 deletions .../hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
From 15b3cef2ea75c4d81cb067264be1cf49c49f81b1 Mon Sep 17 00:00:00 2001
From a778ae244b9e6035ef4c0e4fb36d81f140ed5019 Mon Sep 17 00:00:00 2001
Message-Id: <a778ae244b9e6035ef4c0e4fb36d81f140ed5019.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Mon, 15 Jun 2020 15:38:44 +0200
Subject: [PATCH 7/8] arm64: dts: meson-g12b: odroid-n2: enable audio loopback
Subject: [PATCH 06/14] arm64: dts: meson-g12b: odroid-n2: enable audio
loopback

Add capture pcm interfaces and loopback routes to the odroid-n2

Expand All @@ -14,7 +18,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/b
index 169ea283d4ee..d4421ad164bd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
@@ -209,11 +209,28 @@
@@ -209,11 +209,28 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,axg-sound-card";
model = "G12B-ODROID-N2";
Expand Down Expand Up @@ -45,7 +49,7 @@ index 169ea283d4ee..d4421ad164bd 100644

assigned-clocks = <&clkc CLKID_MPLL2>,
<&clkc CLKID_MPLL0>,
@@ -236,8 +253,20 @@
@@ -236,8 +253,20 @@ dai-link-2 {
sound-dai = <&frddr_c>;
};

Expand All @@ -67,7 +71,7 @@ index 169ea283d4ee..d4421ad164bd 100644
sound-dai = <&tdmif_b>;
dai-format = "i2s";
dai-tdm-slot-tx-mask-0 = <1 1>;
@@ -252,7 +281,7 @@
@@ -252,7 +281,7 @@ codec {
};

/* hdmi glue */
Expand All @@ -76,7 +80,7 @@ index 169ea283d4ee..d4421ad164bd 100644
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;

codec {
@@ -476,6 +505,22 @@
@@ -476,6 +505,22 @@ &tdmif_b {
status = "okay";
};

Expand All @@ -99,7 +103,7 @@ index 169ea283d4ee..d4421ad164bd 100644
&tdmout_b {
status = "okay";
};
@@ -484,6 +529,18 @@
@@ -484,6 +529,18 @@ &tohdmitx {
status = "okay";
};

Expand All @@ -119,5 +123,5 @@ index 169ea283d4ee..d4421ad164bd 100644
status = "okay";
pinctrl-0 = <&uart_ao_a_pins>;
--
2.17.1
2.29.1

21 changes: 12 additions & 9 deletions .../hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
From 978cc250574b7f1ab45f494cc2a094e3c9fd1fa4 Mon Sep 17 00:00:00 2001
From 26603168f26468ac1872fcbcd703d2cd5a626310 Mon Sep 17 00:00:00 2001
Message-Id: <26603168f26468ac1872fcbcd703d2cd5a626310.1603880585.git.stefan@agner.ch>
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Mon, 15 Jun 2020 16:34:37 +0200
Subject: [PATCH 8/8] arm64: dts: meson: odroid-n2: add jack audio output
Subject: [PATCH 07/14] arm64: dts: meson: odroid-n2: add jack audio output
support

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Expand All @@ -21,7 +24,7 @@ index d4421ad164bd..34fffa6d859d 100644
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>

/ {
@@ -20,6 +21,14 @@
@@ -20,6 +21,14 @@ aliases {
ethernet0 = &ethmac;
};

Expand All @@ -36,7 +39,7 @@ index d4421ad164bd..34fffa6d859d 100644
chosen {
stdout-path = "serial0:115200n8";
};
@@ -209,16 +218,26 @@
@@ -209,16 +218,26 @@ hdmi_connector_in: endpoint {
sound {
compatible = "amlogic,axg-sound-card";
model = "G12B-ODROID-N2";
Expand Down Expand Up @@ -65,7 +68,7 @@ index d4421ad164bd..34fffa6d859d 100644
"TODDR_A IN 0", "TDMIN_A OUT",
"TODDR_B IN 0", "TDMIN_A OUT",
"TODDR_C IN 0", "TDMIN_A OUT",
@@ -230,7 +249,11 @@
@@ -230,7 +249,11 @@ sound {
"TODDR_C IN 2", "TDMIN_C OUT",
"TODDR_A IN 6", "TDMIN_LB OUT",
"TODDR_B IN 6", "TDMIN_LB OUT",
Expand All @@ -78,7 +81,7 @@ index d4421ad164bd..34fffa6d859d 100644

assigned-clocks = <&clkc CLKID_MPLL2>,
<&clkc CLKID_MPLL0>,
@@ -275,22 +298,56 @@
@@ -275,22 +298,56 @@ dai-link-6 {
dai-tdm-slot-tx-mask-3 = <1 1>;
mclk-fs = <256>;

Expand Down Expand Up @@ -137,7 +140,7 @@ index d4421ad164bd..34fffa6d859d 100644
&arb {
status = "okay";
};
@@ -505,6 +562,10 @@
@@ -505,6 +562,10 @@ &tdmif_b {
status = "okay";
};

Expand All @@ -148,7 +151,7 @@ index d4421ad164bd..34fffa6d859d 100644
&tdmin_a {
status = "okay";
};
@@ -525,6 +586,14 @@
@@ -525,6 +586,14 @@ &tdmout_b {
status = "okay";
};

Expand All @@ -164,5 +167,5 @@ index d4421ad164bd..34fffa6d859d 100644
status = "okay";
};
--
2.17.1
2.29.1