diff --git a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch deleted file mode 100644 index d323d6860..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e2b93751cfd0722801b65b4603b588ab9df4c12b Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Tue, 21 Apr 2020 18:39:30 +0200 -Subject: [PATCH 2/8] 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 -with it to make a functional sound card on these platforms. - -Also enable the simple amplifier module which often used on the -output stage of those cards. - -Signed-off-by: Jerome Brunet -Signed-off-by: Kevin Hilman -Tested-by: Christian Hewitt -Link: https://lore.kernel.org/r/20200421163935.775935-2-jbrunet@baylibre.com ---- - arch/arm64/configs/defconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 03d0189f7d68..ceb60ee9c340 100644 ---- a/arch/arm64/configs/defconfig -+++ b/arch/arm64/configs/defconfig -@@ -644,6 +644,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m - CONFIG_SND_SOC=y - CONFIG_SND_BCM2835_SOC_I2S=m - CONFIG_SND_MESON_AXG_SOUND_CARD=m -+CONFIG_SND_MESON_GX_SOUND_CARD=m - CONFIG_SND_SOC_SDM845=m - CONFIG_SND_SOC_ROCKCHIP=m - CONFIG_SND_SOC_ROCKCHIP_SPDIF=m -@@ -656,6 +657,7 @@ CONFIG_SND_SOC_AK4613=m - CONFIG_SND_SOC_ES7134=m - CONFIG_SND_SOC_ES7241=m - CONFIG_SND_SOC_PCM3168A_I2C=m -+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m - CONFIG_SND_SOC_TAS571X=m - CONFIG_SND_SOC_WCD934X=m - CONFIG_SND_SOC_WSA881X=m --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch similarity index 98% rename from buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch rename to buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch index 335f704c6..5f2f534bc 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-convert-ODROID-N2-to-dtsi.patch @@ -1,10 +1,8 @@ -From 9443f2cd21a8ebd08f0fb64f5b3a8ccb6cd77d8e Mon Sep 17 00:00:00 2001 -Message-Id: <9443f2cd21a8ebd08f0fb64f5b3a8ccb6cd77d8e.1596660075.git.stefan@agner.ch> -In-Reply-To: -References: +From d35db3d5f943fea569dde8e83f15565254643385 Mon Sep 17 00:00:00 2001 +Message-Id: From: Christian Hewitt Date: Sun, 19 Jul 2020 14:10:32 +0000 -Subject: [PATCH 08/10] arm64: dts: meson: convert ODROID-N2 to dtsi +Subject: [PATCH 1/4] arm64: dts: meson: convert ODROID-N2 to dtsi Convert the current ODROID-N2 dts into a common dtsi in preparation for adding ODROID-N2+ support. @@ -1283,5 +1281,5 @@ index 000000000000..e5bc132ce7d5 + phy-supply = <&hub_5v>; +}; -- -2.27.0 +2.28.0 diff --git a/buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch b/buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch deleted file mode 100644 index b068aa1e4..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 821b8ac21b1675910423ee69d37cb1977b8f271e Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Mon, 30 Mar 2020 17:39:04 +0200 -Subject: [PATCH 3/8] 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. - -Signed-off-by: Jerome Brunet ---- - sound/soc/meson/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig -index 8b6295283989..363dc3b1bbe4 100644 ---- a/sound/soc/meson/Kconfig -+++ b/sound/soc/meson/Kconfig -@@ -68,6 +68,7 @@ config SND_MESON_AXG_SOUND_CARD - imply SND_MESON_AXG_SPDIFOUT - imply SND_MESON_AXG_SPDIFIN - imply SND_MESON_AXG_PDM -+ imply SND_MESON_G12A_TOACODEC - imply SND_MESON_G12A_TOHDMITX if DRM_MESON_DW_HDMI - help - Select Y or M to add support for the AXG SoC sound card --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0009-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch b/buildroot-external/board/hardkernel/patches/linux/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch similarity index 62% rename from buildroot-external/board/hardkernel/patches/linux/0009-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch rename to buildroot-external/board/hardkernel/patches/linux/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch index 23b58efb2..39ff63029 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0009-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch @@ -1,11 +1,10 @@ -From 54d8ae2ae7a10dab6998b2d4ac507aec96c6f1da Mon Sep 17 00:00:00 2001 -Message-Id: <54d8ae2ae7a10dab6998b2d4ac507aec96c6f1da.1595882680.git.stefan@agner.ch> -In-Reply-To: -References: +From 4b9d9159ed5a79ceac5b831012b3cb44cce2516c Mon Sep 17 00:00:00 2001 +Message-Id: <4b9d9159ed5a79ceac5b831012b3cb44cce2516c.1602360581.git.stefan@agner.ch> +In-Reply-To: +References: From: Christian Hewitt Date: Sun, 19 Jul 2020 14:10:33 +0000 -Subject: [PATCH 09/10] dt-bindings: arm: amlogic: add support for the - ODROID-N2+ +Subject: [PATCH 2/4] dt-bindings: arm: amlogic: add support for the ODROID-N2+ HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports higher cpu clock speeds than the original ODROID-N2. @@ -16,17 +15,17 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index f74aba48cec1..915ef4f355ad 100644 +index 5eba9f48823e..12ba8d074370 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -149,6 +149,7 @@ properties: - items: - - enum: +@@ -153,6 +153,7 @@ properties: + - azw,gtking + - azw,gtking-pro - hardkernel,odroid-n2 + - hardkernel,odroid-n2-plus - khadas,vim3 - ugoos,am6 - const: amlogic,s922x -- -2.27.0 +2.28.0 diff --git a/buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch b/buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch deleted file mode 100644 index 2799dc30f..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60164df03c6314d8f5f3afef56b0bf97962ec9ee Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Mon, 24 Feb 2020 14:35:17 +0100 -Subject: [PATCH 4/8] 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. - -Ex: -arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:1: missing phandle tag in 0 -arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:2: missing phandle tag in 0 -arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0: [66, 0, 0] is too long - -The reason is that the sound-dai phandle provided has cells, and in such -case the schema should use 'phandle-array' instead of 'phandle'. - -Fixes: fd00366b8e41 ("ASoC: meson: gx: add sound card dt-binding documentation") -Signed-off-by: Jerome Brunet ---- - .../devicetree/bindings/sound/amlogic,gx-sound-card.yaml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml -index fb374c659be1..a48222e8cd08 100644 ---- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml -+++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml -@@ -57,7 +57,7 @@ patternProperties: - rate - - sound-dai: -- $ref: /schemas/types.yaml#/definitions/phandle -+ $ref: /schemas/types.yaml#/definitions/phandle-array - description: phandle of the CPU DAI - - patternProperties: -@@ -71,7 +71,7 @@ patternProperties: - - properties: - sound-dai: -- $ref: /schemas/types.yaml#/definitions/phandle -+ $ref: /schemas/types.yaml#/definitions/phandle-array - description: phandle of the codec DAI - - required: --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-add-support-for-the-ODROID-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch similarity index 85% rename from buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-add-support-for-the-ODROID-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch index 42ebf9903..61a55fa7d 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0010-arm64-dts-meson-add-support-for-the-ODROID-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch @@ -1,10 +1,10 @@ -From 188bc924b34b7d845324eb2e0e7493a9eaeb2cb5 Mon Sep 17 00:00:00 2001 -Message-Id: <188bc924b34b7d845324eb2e0e7493a9eaeb2cb5.1595882680.git.stefan@agner.ch> -In-Reply-To: -References: +From 81b5af6c3ce3e0f312be0897bec0b3c942e2ce97 Mon Sep 17 00:00:00 2001 +Message-Id: <81b5af6c3ce3e0f312be0897bec0b3c942e2ce97.1602360581.git.stefan@agner.ch> +In-Reply-To: +References: From: Christian Hewitt Date: Sun, 19 Jul 2020 14:10:34 +0000 -Subject: [PATCH 10/10] arm64: dts: meson: add support for the ODROID-N2+ +Subject: [PATCH 3/4] arm64: dts: meson: add support for the ODROID-N2+ HardKernel ODROID-N2+ uses an Amlogic S922X rev. C chip capable of higher clock speeds than the original ODROID-N2. Hardkernel supports the big cpu @@ -22,10 +22,10 @@ Signed-off-by: Stefan Agner create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index eef0045320f2..7524cf9680f5 100644 +index 4e2239ffcaa5..b0b3d6791499 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb @@ -93,5 +93,5 @@ index 000000000000..4ebb448d233f +}; + -- -2.27.0 +2.28.0 diff --git a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch deleted file mode 100644 index 4059bf8b0..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e128dd1ca079c5ee558ab100387d9f81bd4f3980 Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Thu, 7 May 2020 00:16:55 +0200 -Subject: [PATCH 5/8] arm64: dts: meson: g12: add internal DAC - -add internal audio DAC support on the g12 and sm1 SoC family - -Signed-off-by: Jerome Brunet -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20200506221656.477379-7-jbrunet@baylibre.com ---- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -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 @@ - }; - }; - -+ acodec: audio-controller@32000 { -+ compatible = "amlogic,t9015"; -+ reg = <0x0 0x32000 0x0 0x14>; -+ #sound-dai-cells = <0>; -+ sound-name-prefix = "ACODEC"; -+ clocks = <&clkc CLKID_AUDIO_CODEC>; -+ clock-names = "pclk"; -+ resets = <&reset RESET_AUDIO_CODEC>; -+ status = "disabled"; -+ }; -+ - periphs: bus@34400 { - compatible = "simple-bus"; - reg = <0x0 0x34400 0x0 0x400>; --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch b/buildroot-external/board/hardkernel/patches/linux/0004-clk-meson-g12a-mark-fclk_div2-as-critical.patch similarity index 71% rename from buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch rename to buildroot-external/board/hardkernel/patches/linux/0004-clk-meson-g12a-mark-fclk_div2-as-critical.patch index 2095a67ba..dcd0d723c 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0011-clk-meson-g12a-mark-fclk_div2-as-critical.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0004-clk-meson-g12a-mark-fclk_div2-as-critical.patch @@ -1,10 +1,10 @@ -From c33df0ebe8be16b56741ce7f873221ab9087a0a6 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 6a7c42785788faa862aeb7902cb2b3b08f033ca0 Mon Sep 17 00:00:00 2001 +Message-Id: <6a7c42785788faa862aeb7902cb2b3b08f033ca0.1602360581.git.stefan@agner.ch> +In-Reply-To: +References: From: Stefan Agner Date: Thu, 27 Aug 2020 23:29:57 +0200 -Subject: [PATCH 11/11] clk: meson: g12a: mark fclk_div2 as critical +Subject: [PATCH 4/4] clk: meson: g12a: mark fclk_div2 as critical On Amlogic Meson G12b platform, similar to fclk_div3, the fclk_div2 seems to be necessary for the system to operate correctly as well. @@ -22,7 +22,7 @@ Signed-off-by: Stefan Agner 1 file changed, 1 insertion(+) diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c -index fad616cac01e..2214b974f748 100644 +index 9803d44bb157..9a6722a1dc19 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -298,6 +298,7 @@ static struct clk_regmap g12a_fclk_div2 = { diff --git a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch deleted file mode 100644 index 515ba0574..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5ea4085da165fd3f3aa211cb3664dd166d0d5fd7 Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Thu, 7 May 2020 00:16:56 +0200 -Subject: [PATCH 6/8] 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 -the internal audio DAC codec. - -Signed-off-by: Jerome Brunet -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20200506221656.477379-8-jbrunet@baylibre.com ---- - arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi -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 @@ - status = "disabled"; - }; - -+ toacodec: audio-controller@740 { -+ compatible = "amlogic,g12a-toacodec"; -+ reg = <0x0 0x740 0x0 0x4>; -+ #sound-dai-cells = <1>; -+ sound-name-prefix = "TOACODEC"; -+ resets = <&clkc_audio AUD_RESET_TOACODEC>; -+ status = "disabled"; -+ }; -+ - tohdmitx: audio-controller@744 { - compatible = "amlogic,g12a-tohdmitx"; - reg = <0x0 0x744 0x0 0x4>; --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch b/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch deleted file mode 100644 index 0a4741d94..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 15b3cef2ea75c4d81cb067264be1cf49c49f81b1 Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Mon, 15 Jun 2020 15:38:44 +0200 -Subject: [PATCH 7/8] arm64: dts: meson-g12b: odroid-n2: enable audio loopback - -Add capture pcm interfaces and loopback routes to the odroid-n2 - -Signed-off-by: Jerome Brunet ---- - .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 65 +++++++++++++++++-- - 1 file changed, 61 insertions(+), 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts -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 @@ - sound { - compatible = "amlogic,axg-sound-card"; - model = "G12B-ODROID-N2"; -- audio-aux-devs = <&tdmout_b>; -+ audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>, -+ <&tdmin_c>, <&tdmin_lb>; - audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", - "TDMOUT_B IN 1", "FRDDR_B OUT 1", - "TDMOUT_B IN 2", "FRDDR_C OUT 1", -- "TDM_B Playback", "TDMOUT_B OUT"; -+ "TDM_B Playback", "TDMOUT_B OUT", -+ "TDMIN_A IN 4", "TDM_B Loopback", -+ "TDMIN_B IN 4", "TDM_B Loopback", -+ "TDMIN_C IN 4", "TDM_B Loopback", -+ "TDMIN_LB IN 1", "TDM_B Loopback", -+ "TODDR_A IN 0", "TDMIN_A OUT", -+ "TODDR_B IN 0", "TDMIN_A OUT", -+ "TODDR_C IN 0", "TDMIN_A OUT", -+ "TODDR_A IN 1", "TDMIN_B OUT", -+ "TODDR_B IN 1", "TDMIN_B OUT", -+ "TODDR_C IN 1", "TDMIN_B OUT", -+ "TODDR_A IN 2", "TDMIN_C OUT", -+ "TODDR_B IN 2", "TDMIN_C OUT", -+ "TODDR_C IN 2", "TDMIN_C OUT", -+ "TODDR_A IN 6", "TDMIN_LB OUT", -+ "TODDR_B IN 6", "TDMIN_LB OUT", -+ "TODDR_C IN 6", "TDMIN_LB OUT"; - - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, -@@ -236,8 +253,20 @@ - sound-dai = <&frddr_c>; - }; - -- /* 8ch hdmi interface */ - dai-link-3 { -+ sound-dai = <&toddr_a>; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&toddr_b>; -+ }; -+ -+ dai-link-5 { -+ sound-dai = <&toddr_c>; -+ }; -+ -+ /* 8ch hdmi interface */ -+ dai-link-6 { - sound-dai = <&tdmif_b>; - dai-format = "i2s"; - dai-tdm-slot-tx-mask-0 = <1 1>; -@@ -252,7 +281,7 @@ - }; - - /* hdmi glue */ -- dai-link-4 { -+ dai-link-7 { - sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; - - codec { -@@ -476,6 +505,22 @@ - status = "okay"; - }; - -+&tdmin_a { -+ status = "okay"; -+}; -+ -+&tdmin_b { -+ status = "okay"; -+}; -+ -+&tdmin_c { -+ status = "okay"; -+}; -+ -+&tdmin_lb { -+ status = "okay"; -+}; -+ - &tdmout_b { - status = "okay"; - }; -@@ -484,6 +529,18 @@ - status = "okay"; - }; - -+&toddr_a { -+ status = "okay"; -+}; -+ -+&toddr_b { -+ status = "okay"; -+}; -+ -+&toddr_c { -+ status = "okay"; -+}; -+ - &uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch b/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch deleted file mode 100644 index b3f613ef1..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 978cc250574b7f1ab45f494cc2a094e3c9fd1fa4 Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Mon, 15 Jun 2020 16:34:37 +0200 -Subject: [PATCH 8/8] arm64: dts: meson: odroid-n2: add jack audio output - support - -Signed-off-by: Jerome Brunet ---- - .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 79 +++++++++++++++++-- - 1 file changed, 74 insertions(+), 5 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts -index d4421ad164bd..34fffa6d859d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts -@@ -9,6 +9,7 @@ - #include "meson-g12b-s922x.dtsi" - #include - #include -+#include - #include - - / { -@@ -20,6 +21,14 @@ - ethernet0 = ðmac; - }; - -+ dioo2133: audio-amplifier-0 { -+ compatible = "simple-audio-amplifier"; -+ enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; -+ VCC-supply = <&vcc_5v>; -+ sound-name-prefix = "U19"; -+ status = "okay"; -+ }; -+ - chosen { - stdout-path = "serial0:115200n8"; - }; -@@ -209,16 +218,26 @@ - sound { - compatible = "amlogic,axg-sound-card"; - model = "G12B-ODROID-N2"; -- audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>, -- <&tdmin_c>, <&tdmin_lb>; -+ audio-widgets = "Line", "Lineout"; -+ audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&tdmin_a>, -+ <&tdmin_b>, <&tdmin_c>, <&tdmin_lb>, -+ <&dioo2133>; - audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", - "TDMOUT_B IN 1", "FRDDR_B OUT 1", - "TDMOUT_B IN 2", "FRDDR_C OUT 1", - "TDM_B Playback", "TDMOUT_B OUT", -+ "TDMOUT_C IN 0", "FRDDR_A OUT 2", -+ "TDMOUT_C IN 1", "FRDDR_B OUT 2", -+ "TDMOUT_C IN 2", "FRDDR_C OUT 2", -+ "TDM_C Playback", "TDMOUT_C OUT", - "TDMIN_A IN 4", "TDM_B Loopback", - "TDMIN_B IN 4", "TDM_B Loopback", - "TDMIN_C IN 4", "TDM_B Loopback", - "TDMIN_LB IN 1", "TDM_B Loopback", -+ "TDMIN_A IN 5", "TDM_C Loopback", -+ "TDMIN_B IN 5", "TDM_C Loopback", -+ "TDMIN_C IN 5", "TDM_C Loopback", -+ "TDMIN_LB IN 2", "TDM_C Loopback", - "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 @@ - "TODDR_C IN 2", "TDMIN_C OUT", - "TODDR_A IN 6", "TDMIN_LB OUT", - "TODDR_B IN 6", "TDMIN_LB OUT", -- "TODDR_C IN 6", "TDMIN_LB OUT"; -+ "TODDR_C IN 6", "TDMIN_LB OUT", -+ "U19 INL", "ACODEC LOLP", -+ "U19 INR", "ACODEC LORP", -+ "Lineout", "U19 OUTL", -+ "Lineout", "U19 OUTR"; - - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, -@@ -275,22 +298,56 @@ - dai-tdm-slot-tx-mask-3 = <1 1>; - mclk-fs = <256>; - -- codec { -+ codec-0 { - sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; - }; -+ -+ codec-1 { -+ sound-dai = <&toacodec TOACODEC_IN_B>; -+ }; - }; - -- /* hdmi glue */ -+ /* i2s jack output interface */ - dai-link-7 { -+ sound-dai = <&tdmif_c>; -+ dai-format = "i2s"; -+ dai-tdm-slot-tx-mask-0 = <1 1>; -+ mclk-fs = <256>; -+ -+ codec-0 { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>; -+ }; -+ -+ codec-1 { -+ sound-dai = <&toacodec TOACODEC_IN_C>; -+ }; -+ }; -+ -+ /* hdmi glue */ -+ dai-link-8 { - sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; - - codec { - sound-dai = <&hdmi_tx>; - }; - }; -+ -+ /* acodec glue */ -+ dai-link-9 { -+ sound-dai = <&toacodec TOACODEC_OUT>; -+ -+ codec { -+ sound-dai = <&acodec>; -+ }; -+ }; - }; - }; - -+&acodec { -+ AVDD-supply = <&vddao_1v8>; -+ status = "okay"; -+}; -+ - &arb { - status = "okay"; - }; -@@ -505,6 +562,10 @@ - status = "okay"; - }; - -+&tdmif_c { -+ status = "okay"; -+}; -+ - &tdmin_a { - status = "okay"; - }; -@@ -525,6 +586,14 @@ - status = "okay"; - }; - -+&tdmout_c { -+ status = "okay"; -+}; -+ -+&toacodec { -+ status = "okay"; -+}; -+ - &tohdmitx { - status = "okay"; - }; --- -2.17.1 - diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index dd73aed0f..54f15a685 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -89,7 +89,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 3b1fcecb5..bf50b00dd 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -89,7 +89,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index ecc84e65e..1a3e27d6b 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.1" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y @@ -93,7 +93,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-patches/0008-Linux-5.7.patch b/buildroot-patches/0008-Linux-5.7.patch deleted file mode 100644 index e26780a70..000000000 --- a/buildroot-patches/0008-Linux-5.7.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e36dc9a2a030204b5b6c6868348878b596f88de3 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Fri, 5 Jun 2020 14:18:26 +0000 -Subject: [PATCH 1/1] Linux 5.7 - -Signed-off-by: Pascal Vizeli ---- - package/linux-headers/Config.in.host | 4 ++++ - toolchain/Config.in | 5 +++++ - .../toolchain-external-custom/Config.in.options | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host -index 95e85a00..88b9ff99 100644 ---- a/package/linux-headers/Config.in.host -+++ b/package/linux-headers/Config.in.host -@@ -127,6 +127,10 @@ choice - If your kernel headers are more recent than the latest version - in the choice, then select the latest version. - -+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 -+ bool "5.7.x or later" -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 -+ - config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 - bool "5.4.x or later" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -diff --git a/toolchain/Config.in b/toolchain/Config.in -index bff57280..c07a92ce 100644 ---- a/toolchain/Config.in -+++ b/toolchain/Config.in -@@ -470,6 +470,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 - select BR2_TOOLCHAIN_HEADERS_LATEST - -+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 -+ bool -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -+ - # This should be selected by the latest version, above, to indicate that - # Buildroot does not know of more recent headers than the ones selected. - # This allows using toolchains with headers more recent than Buildroot -@@ -481,6 +485,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST - # stops affecting a value on the first matching default. - config BR2_TOOLCHAIN_HEADERS_AT_LEAST - string -+ default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 - default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - default "5.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 - default "5.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 -diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -index 8c38dd9f..b49231e1 100644 ---- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -@@ -115,6 +115,10 @@ choice - If your toolchain uses headers newer than the latest version - in the choice, then select the latest version. - -+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7 -+ bool "5.7.x or later" -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 -+ - config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4 - bool "5.4.x or later" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 --- -2.17.1 - diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 1b2e2e5bf..7fbd07015 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -127,10 +127,6 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. -config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 - bool "5.7.x or later" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 - config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 bool "5.4.x or later" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index c07a92ce5..bff572805 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -470,10 +470,6 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 select BR2_TOOLCHAIN_HEADERS_LATEST -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - # This should be selected by the latest version, above, to indicate that # Buildroot does not know of more recent headers than the ones selected. # This allows using toolchains with headers more recent than Buildroot @@ -485,7 +481,6 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string - default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 default "5.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 default "5.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index b49231e16..8c38dd9fc 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -115,10 +115,6 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7 - bool "5.7.x or later" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 - config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4 bool "5.4.x or later" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4