jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: bump Amlogic kernel to 5.11-rc5 and update patches/defconfig

Browse Source
This commit is contained in:
chewitt 2020-09-19 15:05:01 +00:00 committed by Christian Hewitt
parent 6d710690a9
commit fb59b76d15
100 changed files with 1972 additions and 1459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/linux/package.mk
View File

@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"
case "${LINUX}" in
amlogic)
PKG_VERSION="7c53f6b671f4aba70ff15e1b05148b10d58c2837" # 5.11-rc3
PKG_SHA256="30206f178c9c151a0c387c7967800bc0bf89a893958241a3add0098d443f323a"
PKG_VERSION="6ee1d745b7c9fd573fba142a2efdad76a9f1cb04" # 5.11-rc5
PKG_SHA256="56d3dddbd4d8dcca641683262bfe2dba5049b296abca9f1fc882e156cd206d4e"
PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;;

441
projects/Amlogic/linux/linux.aarch64.conf
View File

File diff suppressed because it is too large Load Diff

10
projects/Amlogic/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-768MB.patch → projects/Amlogic/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-896MB.patch
View File

@ -1,9 +1,9 @@
From b74116343cce0ffed44770904e11f865acf0aa7c Mon Sep 17 00:00:00 2001
From ad278b0b4de9ef9e8ef1b06db91caeafe158df75 Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
Date: Sat, 13 Apr 2019 05:41:51 +0000
Subject: [PATCH 01/79] HACK: set meson-gx cma pool to 768MB
Subject: [PATCH 01/76] HACK: set meson-gx cma pool to 896MB
This change sets the CMA pool to a larger 768MB! value for vdec use
This change sets the CMA pool to a larger 896MB! value for vdec use
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 726b91d3a905..2ac6eaa451cf 100644
index 726b91d3a905..d90a7e376a62 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -47,7 +47,7 @@
@ -19,7 +19,7 @@ index 726b91d3a905..2ac6eaa451cf 100644
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x10000000>;
+ size = <0x0 0x30000000>;
+ size = <0x0 0x38000000>;
alignment = <0x0 0x400000>;
linux,cma-default;
};

10
projects/Amlogic/patches/linux/amlogic-0003-HACK-set-meson-g12-cma-pool-to-768MB.patch → projects/Amlogic/patches/linux/amlogic-0002-HACK-set-meson-g12-cma-pool-to-896MB.patch
View File

@ -1,9 +1,9 @@
From 3e935a9c199bb929c29689d7feb28f7b430dac90 Mon Sep 17 00:00:00 2001
From b915964814b1b467787627dc8e622bf7db63a730 Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
Date: Wed, 14 Aug 2019 19:58:14 +0000
Subject: [PATCH 03/79] HACK: set meson-g12 cma pool to 768MB
Subject: [PATCH 02/76] HACK: set meson-g12 cma pool to 896MB
This change sets the CMA pool to a larger 768MB! value for vdec use
This change sets the CMA pool to a larger 896MB! value for vdec use
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 9c90d562ada1..e117a914c4d6 100644
index 9c90d562ada1..9f79f594c6a7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -104,7 +104,7 @@
@ -19,7 +19,7 @@ index 9c90d562ada1..e117a914c4d6 100644
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x10000000>;
+ size = <0x0 0x30000000>;
+ size = <0x0 0x38000000>;
alignment = <0x0 0x400000>;
linux,cma-default;
};

25
projects/Amlogic/patches/linux/amlogic-0002-HACK-set-meson-gx-cma-pool-to-896MB.patch
View File

@ -1,25 +0,0 @@
From 00eb6cb04920d82eea717b49a28c0d061a145c97 Mon Sep 17 00:00:00 2001
From: chewitt <christianshewitt@gmail.com>
Date: Wed, 28 Oct 2020 14:14:30 +0000
Subject: [PATCH 02/79] HACK: set meson-gx cma pool to 896MB
---
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 2ac6eaa451cf..d90a7e376a62 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -47,7 +47,7 @@
linux,cma {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x30000000>;
+ size = <0x0 0x38000000>;
alignment = <0x0 0x400000>;
linux,cma-default;
};
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0005-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch → projects/Amlogic/patches/linux/amlogic-0003-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch
View File

@ -1,7 +1,7 @@
From 852df5d6c6d7bf165c5485a7d878feddc02df7ed Mon Sep 17 00:00:00 2001
From c8825237212d95c846d956c42aca4b6a7b525be8 Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
Date: Sat, 13 Apr 2019 05:45:18 +0000
Subject: [PATCH 05/79] HACK: arm64: fix Kodi sysinfo CPU information
Subject: [PATCH 03/76] HACK: arm64: fix Kodi sysinfo CPU information
This allows the CPU information to show in the Kodi sysinfo screen, e.g.

4
projects/Amlogic/patches/linux/amlogic-0006-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch → projects/Amlogic/patches/linux/amlogic-0004-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch
View File

@ -1,7 +1,7 @@
From e61e3429cc2d3bcac28191cb57e6dbcf7b91feb4 Mon Sep 17 00:00:00 2001
From 00500ea062d07a5340d72063061e0109d488c0d9 Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Sat, 6 Jul 2019 07:54:44 +0000
Subject: [PATCH 06/79] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
Subject: [PATCH 04/76] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
memory region
Vendor firmware/uboot has an additional reserved region for BL32 trusted

25
projects/Amlogic/patches/linux/amlogic-0004-HACK-set-meson-g12-cma-pool-to-896MB.patch
View File

@ -1,25 +0,0 @@
From abbe7433cb0ade15c56fa310df0b160046c1cdc5 Mon Sep 17 00:00:00 2001
From: chewitt <christianshewitt@gmail.com>
Date: Wed, 28 Oct 2020 14:15:27 +0000
Subject: [PATCH 04/79] HACK: set meson-g12 cma pool to 896MB
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index e117a914c4d6..9f79f594c6a7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -104,7 +104,7 @@
linux,cma {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x30000000>;
+ size = <0x0 0x38000000>;
alignment = <0x0 0x400000>;
linux,cma-default;
};
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0007-HACK-drm-meson-add-YUV422-output-support.patch → projects/Amlogic/patches/linux/amlogic-0005-HACK-drm-meson-add-YUV422-output-support.patch
View File

@ -1,7 +1,7 @@
From a168bc7413bf9d8a67bf5cad5009434e75f380e7 Mon Sep 17 00:00:00 2001
From d2794dfd488506e16dff8be3bbb8b4274f90f4a6 Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Wed, 29 Jul 2020 04:05:03 +0900
Subject: [PATCH 07/79] HACK: drm/meson: add YUV422 output support
Subject: [PATCH 05/76] HACK: drm/meson: add YUV422 output support
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI
controller. This incorrectly fixes the green-line on GX devices.

58
projects/Amlogic/patches/linux/amlogic-0006-HACK-mmc-core-always-re-init-sdcards-to-set-default-.patch Normal file
View File

@ -0,0 +1,58 @@
From 915da94d239f404300ad4f0039852193a5570eee Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 16 Apr 2020 08:31:55 +0000
Subject: [PATCH 06/76] HACK: mmc: core: always re-init sdcards to set default
3.3v regulator ios
sd-uhs-** in device-tree changes the voltage to 1.8v, so we need to ensure
the card is reset to 3.3v before rebooting else on reboot there is no card
to boot from.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/mmc/core/sd.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 6f054c449d46..5eeccc8b1e00 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1245,6 +1245,26 @@ static int mmc_sd_suspend(struct mmc_host *host)
return err;
}
+/*
+ * Callback for shutdown
+ */
+static int mmc_sd_shutdown(struct mmc_host *host)
+{
+ mmc_claim_host(host);
+
+ if (mmc_card_suspended(host->card))
+ goto out;
+
+ mmc_power_off(host);
+ mmc_card_set_suspended(host->card);
+
+ pm_runtime_disable(&host->card->dev);
+ pm_runtime_set_suspended(&host->card->dev);
+
+out:
+ return 0;
+}
+
/*
* This function tries to determine if the same card is still present
* and, if so, restore all state to it.
@@ -1323,7 +1343,7 @@ static const struct mmc_bus_ops mmc_sd_ops = {
.suspend = mmc_sd_suspend,
.resume = mmc_sd_resume,
.alive = mmc_sd_alive,
- .shutdown = mmc_sd_suspend,
+ .shutdown = mmc_sd_shutdown,
.hw_reset = mmc_sd_hw_reset,
};
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0011-FROMGIT-arm64-dts-amlogic-meson-g12-Set-FL-adj-prope.patch → projects/Amlogic/patches/linux/amlogic-0007-FROMGIT-arm64-dts-amlogic-meson-g12-Set-FL-adj-prope.patch
View File

@ -1,7 +1,7 @@
From 2d4d5eed504288fb2dfbc748bf0f14247107338f Mon Sep 17 00:00:00 2001
From 7cfddbebb68fb53de5e3ccb8dac8c53669bb9714 Mon Sep 17 00:00:00 2001
From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Date: Mon, 11 Jan 2021 14:45:19 +0000
Subject: [PATCH 11/79] FROMGIT: arm64: dts: amlogic: meson-g12: Set FL-adj
Subject: [PATCH 07/76] FROMGIT: arm64: dts: amlogic: meson-g12: Set FL-adj
property value
In accordance with the DWC USB3 bindings the property is supposed to have

4
projects/Amlogic/patches/linux/amlogic-0012-FROMGIT-arm64-dts-meson-Fix-schema-warnings-for-pwm-.patch → projects/Amlogic/patches/linux/amlogic-0008-FROMGIT-arm64-dts-meson-Fix-schema-warnings-for-pwm-.patch
View File

@ -1,7 +1,7 @@
From 5b1d18153478ce0bb436e9caded357b7d5ab44f9 Mon Sep 17 00:00:00 2001
From 05e349e62469e956929ea6e9592d523059047e04 Mon Sep 17 00:00:00 2001
From: Alexander Dahl <post@lespocky.de>
Date: Mon, 11 Jan 2021 14:47:38 +0000
Subject: [PATCH 12/79] FROMGIT: arm64: dts: meson: Fix schema warnings for
Subject: [PATCH 08/76] FROMGIT: arm64: dts: meson: Fix schema warnings for
pwm-leds
The node names for devices using the pwm-leds driver follow a certain

29
projects/Amlogic/patches/linux/amlogic-0008-HACK-drm-panfrost-force-governor-to-performance.patch
View File

@ -1,29 +0,0 @@
From 293bbf42eebeabd97333684096b375f8423ac4dd Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 19 Dec 2020 19:14:32 +0000
Subject: [PATCH 08/79] HACK: drm/panfrost: force governor to performance
Kodi GUI is sluggish with ondemand, and it never seems to use higher
clock speeds. Override this and use the performance governor.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index f44d28fad085..102a3dc146be 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -130,7 +130,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
dev_pm_opp_put(opp);
devfreq = devm_devfreq_add_device(dev, &panfrost_devfreq_profile,
- DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
+ DEVFREQ_GOV_PERFORMANCE, NULL);
if (IS_ERR(devfreq)) {
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
ret = PTR_ERR(devfreq);
--
2.17.1

59
projects/Amlogic/patches/linux/amlogic-0009-FROMGIT-ASoC-meson-axg-tdm-interface-fix-loopback.patch
View File

@ -1,59 +0,0 @@
From e0f9450bbd596602eb184cd51ed3b6eed09acaa8 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 17 Dec 2020 19:03:07 +0000
Subject: [PATCH 09/79] FROMGIT: ASoC: meson: axg-tdm-interface: fix loopback
When the axg-tdm-interface was introduced, the backend DAI was marked as an
endpoint when DPCM was walking the DAPM graph to find a its BE.
It is no longer the case since this
commit 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks")
Because of this, when DPCM finds a BE it does everything it needs on the
DAIs but it won't power up the widgets between the FE and the BE if there
is no actual endpoint after the BE.
On meson-axg HWs, the loopback is a special DAI of the tdm-interface BE.
It is only linked to the dummy codec since there no actual HW after it.
>From the DAPM perspective, the DAI has no endpoint. Because of this, the TDM
decoder, which is a widget between the FE and BE is not powered up.
>From the user perspective, everything seems fine but no data is produced.
Connecting the Loopback DAI to a dummy DAPM endpoint solves the problem.
Fixes: 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks")
Cc: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
sound/soc/meson/axg-tdm-interface.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index c8664ab80d45..87cac440b369 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -467,8 +467,20 @@ static int axg_tdm_iface_set_bias_level(struct snd_soc_component *component,
return ret;
}
+static const struct snd_soc_dapm_widget axg_tdm_iface_dapm_widgets[] = {
+ SND_SOC_DAPM_SIGGEN("Playback Signal"),
+};
+
+static const struct snd_soc_dapm_route axg_tdm_iface_dapm_routes[] = {
+ { "Loopback", NULL, "Playback Signal" },
+};
+
static const struct snd_soc_component_driver axg_tdm_iface_component_drv = {
- .set_bias_level = axg_tdm_iface_set_bias_level,
+ .dapm_widgets = axg_tdm_iface_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(axg_tdm_iface_dapm_widgets),
+ .dapm_routes = axg_tdm_iface_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(axg_tdm_iface_dapm_routes),
+ .set_bias_level = axg_tdm_iface_set_bias_level,
};
static const struct of_device_id axg_tdm_iface_of_match[] = {
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0013-FROMGIT-arm64-dts-meson-vim3-whitespace-fixups.patch → projects/Amlogic/patches/linux/amlogic-0009-FROMGIT-arm64-dts-meson-vim3-whitespace-fixups.patch
View File

@ -1,7 +1,7 @@
From ae6f50b1d2b5881739d65713238d79237ab016a9 Mon Sep 17 00:00:00 2001
From 7b979e7ad05c410c0b2b4d44c24f32c669379426 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 4 Dec 2020 14:48:41 +0100
Subject: [PATCH 13/79] FROMGIT: arm64: dts: meson: vim3: whitespace fixups
Subject: [PATCH 09/76] FROMGIT: arm64: dts: meson: vim3: whitespace fixups
Spaces have been used to indent 2 nodes.
Replace those with tabs and remove one extra newline

53
projects/Amlogic/patches/linux/amlogic-0010-FROMGIT-ASoC-meson-axg-tdmin-fix-axg-skew-offset.patch
View File

@ -1,53 +0,0 @@
From f035ed084e24c370281c29b43f1d7cdc8925fbfc Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 17 Dec 2020 19:05:00 +0000
Subject: [PATCH 10/79] FROMGIT: ASoC: meson: axg-tdmin: fix axg skew offset
The signal captured on from tdm decoder of the AXG SoC is incorrect. It
appears amplified. The skew offset of the decoder is wrong.
Setting the skew offset to 3, like the g12 and sm1 SoCs, solves and gives
correct data.
Fixes: 13a22e6a98f8 ("ASoC: meson: add tdm input driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
sound/soc/meson/axg-tdmin.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
index 88ed95ae886b..b4faf9d5c1aa 100644
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
@@ -224,15 +224,6 @@ static const struct axg_tdm_formatter_ops axg_tdmin_ops = {
};
static const struct axg_tdm_formatter_driver axg_tdmin_drv = {
- .component_drv = &axg_tdmin_component_drv,
- .regmap_cfg = &axg_tdmin_regmap_cfg,
- .ops = &axg_tdmin_ops,
- .quirks = &(const struct axg_tdm_formatter_hw) {
- .skew_offset = 2,
- },
-};
-
-static const struct axg_tdm_formatter_driver g12a_tdmin_drv = {
.component_drv = &axg_tdmin_component_drv,
.regmap_cfg = &axg_tdmin_regmap_cfg,
.ops = &axg_tdmin_ops,
@@ -247,10 +238,10 @@ static const struct of_device_id axg_tdmin_of_match[] = {
.data = &axg_tdmin_drv,
}, {
.compatible = "amlogic,g12a-tdmin",
- .data = &g12a_tdmin_drv,
+ .data = &axg_tdmin_drv,
}, {
.compatible = "amlogic,sm1-tdmin",
- .data = &g12a_tdmin_drv,
+ .data = &axg_tdmin_drv,
}, {}
};
MODULE_DEVICE_TABLE(of, axg_tdmin_of_match);
--
2.17.1

6
projects/Amlogic/patches/linux/amlogic-0022-FROMLIST-v1-arm64-dts-meson-vim3-enable-hdmi-audio-l.patch → projects/Amlogic/patches/linux/amlogic-0010-FROMGIT-arm64-dts-meson-vim3-enable-hdmi-audio-loopb.patch
View File

@ -1,8 +1,8 @@
From d6a28cac968ef3683baf3b6f8b329a096de6393a Mon Sep 17 00:00:00 2001
From 23493d56b60796f18114ef6934d391bf22ceb3bb Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 4 Dec 2020 16:23:55 +0100
Subject: [PATCH 22/79] FROMLIST(v1): arm64: dts: meson: vim3: enable hdmi
audio loopback
Subject: [PATCH 10/76] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
loopback
Enable audio capture frontends and a tdm decoder.
This makes it possible to loopback the audio played on the hdmi codec,

6
projects/Amlogic/patches/linux/amlogic-0023-FROMLIST-v1-arm64-dts-meson-switch-TFLASH_VDD_EN-pin.patch → projects/Amlogic/patches/linux/amlogic-0011-FROMGIT-arm64-dts-meson-switch-TFLASH_VDD_EN-pin-to-.patch
View File

@ -1,8 +1,8 @@
From 8034a2829adeb23b0431ace73b1b09221d6f27a7 Mon Sep 17 00:00:00 2001
From d861eb5fa0d8ea16e9b40a8d24a72eebf5719f53 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Sun, 27 Dec 2020 14:42:02 +0000
Subject: [PATCH 23/79] FROMLIST(v1): arm64: dts: meson: switch TFLASH_VDD_EN
pin to open drain on Odroid-C4
Subject: [PATCH 11/76] FROMGIT: arm64: dts: meson: switch TFLASH_VDD_EN pin to
open drain on Odroid-C4
For the proper reboot Odroid-C4 board requires to switch TFLASH_VDD_EN
pin to the high impedance mode, otherwise the board is stuck in the

6
projects/Amlogic/patches/linux/amlogic-0025-FROMLIST-v1-arm64-dts-meson-add-i2c3-rtc-nodes-and-r.patch → projects/Amlogic/patches/linux/amlogic-0012-FROMGIT-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-a.patch
View File

@ -1,8 +1,8 @@
From dad355f2881fee1ef3239f68650feb84c1eb121a Mon Sep 17 00:00:00 2001
From 95798563aae9367daf1ac6658b87cb4ff76d2dae Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 21 Dec 2020 12:06:25 +0000
Subject: [PATCH 25/79] FROMLIST(v1): arm64: dts: meson: add i2c3/rtc nodes and
rtc aliases to ODROID-N2 dtsi
Subject: [PATCH 12/76] FROMGIT: arm64: dts: meson: add i2c3/rtc nodes and rtc
aliases to ODROID-N2 dtsi
Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the
common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0.

10
projects/Amlogic/patches/linux/amlogic-0024-FROMLIST-v2-arm64-dts-meson-add-initial-Beelink-GS-K.patch → projects/Amlogic/patches/linux/amlogic-0013-FROMGIT-arm64-dts-meson-add-initial-Beelink-GS-King-.patch
View File

@ -1,7 +1,7 @@
From ea775ccb6a304e9b294f4aee512d578d271b3a4a Mon Sep 17 00:00:00 2001
From 4cbd3774b438c750f637db262531424906aafa3f Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 12 Jun 2020 08:05:20 +0000
Subject: [PATCH 24/79] FROMLIST(v2): arm64: dts: meson: add initial Beelink
Subject: [PATCH 13/76] FROMGIT: arm64: dts: meson: add initial Beelink
GS-King-X device-tree
The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference
@ -24,6 +24,8 @@ board with an S922X-H chip.
- 1x Power on/off button
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../boot/dts/amlogic/meson-g12b-gsking-x.dts | 133 ++++++++++++++++++
@ -44,7 +46,7 @@ index ced03946314f..dce41cd3f347 100644
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
new file mode 100644
index 000000000000..c9d9dcb0cd65
index 000000000000..211191f66344
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
@@ -0,0 +1,133 @@
@ -85,7 +87,7 @@ index 000000000000..c9d9dcb0cd65
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "G12B-GSKING-X";
+ model = "GSKING-X";
+ audio-aux-devs = <&tdmout_a>;
+ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_A IN 1", "FRDDR_B OUT 1",

47
projects/Amlogic/patches/linux/amlogic-0067-arm64-dts-meson-shorten-audio-card-names-upstream-ca.patch → projects/Amlogic/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-shorten-audio-card-names-for.patch
View File

@ -1,31 +1,14 @@
From 4ea272f3089b07552c45a150b5623dba62d1c176 Mon Sep 17 00:00:00 2001
From fb5e6b0507011d8bd5a06c04905318d38ed0672d Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 15:54:34 +0000
Subject: [PATCH 67/79] arm64: dts: meson: shorten audio card names (upstream
cards)
Subject: [PATCH 14/76] FROMGIT: arm64: dts: meson: shorten audio card names
for alsa compatibility
This patch shortens all audio card model names by dropping the SoC
prefix (for conformity) and rewording those that are still longer
than the 15x character card name limit in alsa.
This patch shortens all audio card model names by dropping the SoC prefix
(for conformity) and rewording those that are still longer than alsa's 15
character name limit [0] to avoid userspace config issues.
Many current names are over the limit so alsa truncates the name
causing a not-obvious mismatch between names in device-tree and
the string to be used in an alsa card conf.
e.g. "G12B-KHADAS-VIM3" is truncated to "G12B-KHADAS-VIM"
VIM3:~ # cat /proc/asound/cards
0 [G12BKHADASVIM3 ]: G12B-KHADAS-VIM - G12B-KHADAS-VIM3
G12B-KHADAS-VIM3
While users copy the device-tree name to confs:
<confdir:pcm/surround51.conf>
G12B-KHADAS-VIM3.pcm.surround51.0 {
@args [ CARD ]
@args.CARD { type string }
type route
slave.pcm {
[0] https://github.com/torvalds/linux/blob/master/Documentation/sound/alsa-configuration.rst#common-parameters-for-top-sound-card-modules
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -48,8 +31,9 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
21 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
index b00d0468c753..81269ccc2496 100644
@ -298,6 +282,19 @@ index 4e4c2f924486..f1706873d7a8 100644
audio-aux-devs = <&tdmin_a>, <&tdmout_a>;
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
index a712273c905a..eadd75e6e067 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
@@ -190,7 +190,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-ODROID-C4";
+ model = "ODROID-C4";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
index 039a8d0d1e9b..2194a778973f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts

4
projects/Amlogic/patches/linux/amlogic-0014-FROMGIT-clk-meson-clk-pll-fix-initializing-the-old-r.patch → projects/Amlogic/patches/linux/amlogic-0015-FROMGIT-clk-meson-clk-pll-fix-initializing-the-old-r.patch
View File

@ -1,7 +1,7 @@
From 1ccea9de12033004d440f7aad8eb3c62fe8d45a8 Mon Sep 17 00:00:00 2001
From 463f2093969a0abc701a738153860987011f07fd Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 26 Dec 2020 23:34:18 +0000
Subject: [PATCH 14/79] FROMGIT: clk: meson: clk-pll: fix initializing the old
Subject: [PATCH 15/76] FROMGIT: clk: meson: clk-pll: fix initializing the old
rate (fallback) for a PLL
The "rate" parameter in meson_clk_pll_set_rate() contains the new rate.

4
projects/Amlogic/patches/linux/amlogic-0015-FROMGIT-clk-meson-clk-pll-make-ret-a-signed-integer.patch → projects/Amlogic/patches/linux/amlogic-0016-FROMGIT-clk-meson-clk-pll-make-ret-a-signed-integer.patch
View File

@ -1,7 +1,7 @@
From 4531d5040a1d6c04cffc76684f9dfcf65bd7d87e Mon Sep 17 00:00:00 2001
From 6b5221da35a0987a9851fa227cd3fede38f684f0 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 26 Dec 2020 23:35:18 +0000
Subject: [PATCH 15/79] FROMGIT: clk: meson: clk-pll: make "ret" a signed
Subject: [PATCH 16/76] FROMGIT: clk: meson: clk-pll: make "ret" a signed
integer
The error codes returned by meson_clk_get_pll_settings() are all

4
projects/Amlogic/patches/linux/amlogic-0016-FROMGIT-clk-meson-clk-pll-propagate-the-error-from-m.patch → projects/Amlogic/patches/linux/amlogic-0017-FROMGIT-clk-meson-clk-pll-propagate-the-error-from-m.patch
View File

@ -1,7 +1,7 @@
From 6c888b9a837e8e9e40bb72479744c8b8f25ad456 Mon Sep 17 00:00:00 2001
From 79f397fdecc45a1776ba8b35d7507bbc12afc837 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 26 Dec 2020 23:36:09 +0000
Subject: [PATCH 16/79] FROMGIT: clk: meson: clk-pll: propagate the error from
Subject: [PATCH 17/76] FROMGIT: clk: meson: clk-pll: propagate the error from
meson_clk_pll_set_rate()
Popagate the error code from meson_clk_pll_set_rate() when the PLL does

4
projects/Amlogic/patches/linux/amlogic-0017-FROMGIT-dt-bindings-net-dwmac-meson-use-picoseconds-.patch → projects/Amlogic/patches/linux/amlogic-0018-FROMGIT-dt-bindings-net-dwmac-meson-use-picoseconds-.patch
View File

@ -1,7 +1,7 @@
From b3c25d5936f587b6dcdbebfbd1f7e424713defa6 Mon Sep 17 00:00:00 2001
From e7984e0fc2132ce18aba0577a5d0c51ea9af1969 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 14 Nov 2020 17:37:09 +0100
Subject: [PATCH 17/79] FROMGIT: dt-bindings: net: dwmac-meson: use picoseconds
Subject: [PATCH 18/76] FROMGIT: dt-bindings: net: dwmac-meson: use picoseconds
for the RGMII RX delay
Amlogic Meson G12A, G12B and SM1 SoCs have a more advanced RGMII RX

8
projects/Amlogic/patches/linux/amlogic-0026-FROMLIST-v2-dt-bindings-arm-amlogic-add-support-for-.patch → projects/Amlogic/patches/linux/amlogic-0019-FROMGIT-dt-bindings-arm-amlogic-add-support-for-the-.patch
View File

@ -1,13 +1,15 @@
From f1f897b6cf618ab7d4739cde6c7a184d7a05b580 Mon Sep 17 00:00:00 2001
From 5083ba789a08c6afcc104cb8876350ce8e427fe3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 12 Jun 2020 08:04:00 +0000
Subject: [PATCH 26/79] FROMLIST(v2): dt-bindings: arm: amlogic: add support
for the Beelink GS-King-X
Subject: [PATCH 19/76] FROMGIT: dt-bindings: arm: amlogic: add support for the
Beelink GS-King-X
The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference
board with an S922X-H chip.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
1 file changed, 1 insertion(+)

64
projects/Amlogic/patches/linux/amlogic-0020-FROMGIT-drm-panfrost-add-governor-data-with-pre-defi.patch Normal file
View File

@ -0,0 +1,64 @@
From bdc03bebf7cf17e35091d69a058814b880afde63 Mon Sep 17 00:00:00 2001
From: Lukasz Luba <lukasz.luba@arm.com>
Date: Sun, 24 Jan 2021 03:57:47 +0000
Subject: [PATCH 20/76] FROMGIT: drm/panfrost: add governor data with
pre-defined thresholds
The simple_ondemand devfreq governor uses two thresholds to decide about
the frequency change: upthreshold, downdifferential. These two tunable
change the behavior of the governor decision, e.g. how fast to increase
the frequency or how rapidly limit the frequency. This patch adds needed
governor data with thresholds values gathered experimentally in different
workloads.
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 +++++++++-
drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index f44d28fad085..ffbf16506bb5 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -129,8 +129,16 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
panfrost_devfreq_profile.initial_freq = cur_freq;
dev_pm_opp_put(opp);
+ /*
+ * Setup default thresholds for the simple_ondemand governor.
+ * The values are chosen based on experiments.
+ */
+ pfdevfreq->gov_data.upthreshold = 45;
+ pfdevfreq->gov_data.downdifferential = 5;
+
devfreq = devm_devfreq_add_device(dev, &panfrost_devfreq_profile,
- DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
+ DEVFREQ_GOV_SIMPLE_ONDEMAND,
+ &pfdevfreq->gov_data);
if (IS_ERR(devfreq)) {
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
ret = PTR_ERR(devfreq);
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
index db6ea48e21f9..1e2a4de941aa 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
@@ -4,6 +4,7 @@
#ifndef __PANFROST_DEVFREQ_H__
#define __PANFROST_DEVFREQ_H__
+#include <linux/devfreq.h>
#include <linux/spinlock.h>
#include <linux/ktime.h>
@@ -17,6 +18,7 @@ struct panfrost_devfreq {
struct devfreq *devfreq;
struct opp_table *regulators_opp_table;
struct thermal_cooling_device *cooling;
+ struct devfreq_simple_ondemand_data gov_data;
bool opp_of_table_added;
ktime_t busy_time;
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0018-FROMGIT-net-stmmac-dwmac-meson8b-fix-enabling-the-ti.patch → projects/Amlogic/patches/linux/amlogic-0021-FROMGIT-net-stmmac-dwmac-meson8b-fix-enabling-the-ti.patch
View File

@ -1,7 +1,7 @@
From 4d18c18cc0d04d9ca9fd88f2132fa5a7c9645a48 Mon Sep 17 00:00:00 2001
From bb16b76d0b69d83a7182226eede633a89cd85abd Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 15 Nov 2020 10:23:02 +0100
Subject: [PATCH 18/79] FROMGIT: net: stmmac: dwmac-meson8b: fix enabling the
Subject: [PATCH 21/76] FROMGIT: net: stmmac: dwmac-meson8b: fix enabling the
timing-adjustment clock
The timing-adjustment clock only has to be enabled when a) there is a

4
projects/Amlogic/patches/linux/amlogic-0019-FROMGIT-net-stmmac-dwmac-meson8b-use-picoseconds-for.patch → projects/Amlogic/patches/linux/amlogic-0022-FROMGIT-net-stmmac-dwmac-meson8b-use-picoseconds-for.patch
View File

@ -1,7 +1,7 @@
From 2c74f4d1663225c4e735690a65eec62dc7816c75 Mon Sep 17 00:00:00 2001
From 8faf06430d019588bfaa2fa1a0bc16c09d9bbc0f Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 14 Nov 2020 17:41:04 +0100
Subject: [PATCH 19/79] FROMGIT: net: stmmac: dwmac-meson8b: use picoseconds
Subject: [PATCH 22/76] FROMGIT: net: stmmac: dwmac-meson8b: use picoseconds
for the RGMII RX delay
Amlogic Meson G12A, G12B and SM1 SoCs have a more advanced RGMII RX

4
projects/Amlogic/patches/linux/amlogic-0020-FROMGIT-net-stmmac-dwmac-meson8b-move-RGMII-delays-i.patch → projects/Amlogic/patches/linux/amlogic-0023-FROMGIT-net-stmmac-dwmac-meson8b-move-RGMII-delays-i.patch
View File

@ -1,7 +1,7 @@
From c2a20a85df641aaf33cac447a52aa32ffffd80bc Mon Sep 17 00:00:00 2001
From db40c5ed1fec54ab7d970a6337fe7521ca78736c Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 14 Nov 2020 18:02:03 +0100
Subject: [PATCH 20/79] FROMGIT: net: stmmac: dwmac-meson8b: move RGMII delays
Subject: [PATCH 23/76] FROMGIT: net: stmmac: dwmac-meson8b: move RGMII delays
into a separate function
Newer SoCs starting with the Amlogic Meson G12A have more a precise

4
projects/Amlogic/patches/linux/amlogic-0021-FROMGIT-net-stmmac-dwmac-meson8b-add-support-for-the.patch → projects/Amlogic/patches/linux/amlogic-0024-FROMGIT-net-stmmac-dwmac-meson8b-add-support-for-the.patch
View File

@ -1,7 +1,7 @@
From 28f7bd400691b66d51db47de83b8c87fb6bae42a Mon Sep 17 00:00:00 2001
From 181ceef264421a7979830dcd2222574d20e7723a Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 14 Nov 2020 19:41:11 +0100
Subject: [PATCH 21/79] FROMGIT: net: stmmac: dwmac-meson8b: add support for
Subject: [PATCH 24/76] FROMGIT: net: stmmac: dwmac-meson8b: add support for
the RGMII RX delay on G12A
Amlogic Meson G12A (and newer: G12B, SM1) SoCs have a more advanced RX

48
projects/Amlogic/patches/linux/amlogic-0025-FROMGIT-net-stmmac-dwmac-meson8b-fix-the-RX-delay-va.patch Normal file
View File

@ -0,0 +1,48 @@
From fe4f17b6f58e8e0d9cd55a07a6dcd84cba027541 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 20 Jan 2021 02:57:45 +0000
Subject: [PATCH 25/76] FROMGIT: net: stmmac: dwmac-meson8b: fix the RX delay
validation
When has_prg_eth1_rgmii_rx_delay is true then we support RX delays
between 0ps and 3000ps in 200ps steps. Swap the validation of the RX
delay based on the has_prg_eth1_rgmii_rx_delay flag so the 200ps check
is now applied correctly on G12A SoCs (instead of only allow 0ps or
2000ps on G12A, but 0..3000ps in 200ps steps on older SoCs which don't
support that).
Fixes: de94fc104d58ea ("net: stmmac: dwmac-meson8b: add support for the RGMII RX delay on G12A")
Reported-by: Martijn van Deventer <martijn@martijnvandeventer.nl>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
index 55152d7ba99a..848e5c37746b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -443,16 +443,16 @@ static int meson8b_dwmac_probe(struct platform_device *pdev)
}
if (dwmac->data->has_prg_eth1_rgmii_rx_delay) {
- if (dwmac->rx_delay_ps != 0 && dwmac->rx_delay_ps != 2000) {
+ if (dwmac->rx_delay_ps > 3000 || dwmac->rx_delay_ps % 200) {
dev_err(dwmac->dev,
- "The only allowed RGMII RX delays values are: 0ps, 2000ps");
+ "The RGMII RX delay range is 0..3000ps in 200ps steps");
ret = -EINVAL;
goto err_remove_config_dt;
}
} else {
- if (dwmac->rx_delay_ps > 3000 || dwmac->rx_delay_ps % 200) {
+ if (dwmac->rx_delay_ps != 0 && dwmac->rx_delay_ps != 2000) {
dev_err(dwmac->dev,
- "The RGMII RX delay range is 0..3000ps in 200ps steps");
+ "The only allowed RGMII RX delays values are: 0ps, 2000ps");
ret = -EINVAL;
goto err_remove_config_dt;
}
--
2.17.1

77
projects/Amlogic/patches/linux/amlogic-0026-FROMLIST-v1-Revert-arm64-dts-amlogic-add-missing-eth.patch Normal file
View File

@ -0,0 +1,77 @@
From 4e95f9964cb26f12a79b569a527b9ebefd500899 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Tue, 26 Jan 2021 13:04:46 +0000
Subject: [PATCH 26/76] FROMLIST(v1): Revert "arm64: dts: amlogic: add missing
ethernet reset ID"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It has been reported on IRC and in KernelCI boot tests, this change breaks
internal PHY support on the Amlogic G12A/SM1 Based boards.
We suspect the added signal to reset more than the Ethernet MAC but also
the MDIO/(RG)MII mux used to redirect the MAC signals to the internal PHY.
This reverts commit f3362f0c18174a1f334a419ab7d567a36bd1b3f3 while we find
and acceptable solution to cleanly reset the Ethernet MAC.
Reported-by: Corentin Labbe <clabbe@baylibre.com>
Acked-by: Jérôme Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 --
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 --
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 ---
3 files changed, 7 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index ba1c6dfdc4b6..d945c84ab697 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -280,8 +280,6 @@
"timing-adjustment";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
- resets = <&reset RESET_ETHERNET>;
- reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 85def57463db..3a4f20506a61 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -224,8 +224,6 @@
"timing-adjustment";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
- resets = <&reset RESET_ETHERNET>;
- reset-names = "stmmaceth";
status = "disabled";
mdio0: mdio {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index ac6e99a9c95f..cf9eb7c8a6f0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -13,7 +13,6 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/meson-gxbb-power.h>
-#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
#include <dt-bindings/thermal/thermal.h>
/ {
@@ -582,8 +581,6 @@
interrupt-names = "macirq";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
- resets = <&reset RESET_ETHERNET>;
- reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
status = "disabled";
};
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0027-FROMLIST-v1-drm-panfrost-fix-reference-leak-in-panfr.patch
View File

@ -1,7 +1,7 @@
From 2fb7343e4a5a82681549c417d668a4b45ed28a07 Mon Sep 17 00:00:00 2001
From 1dbe2c1c81ce9fd782151c0498862fdeb3a2066b Mon Sep 17 00:00:00 2001
From: Qinglang Miao <miaoqinglang@huawei.com>
Date: Sat, 28 Nov 2020 16:10:04 +0000
Subject: [PATCH 27/79] FROMLIST(v1): drm/panfrost: fix reference leak in
Subject: [PATCH 27/76] FROMLIST(v1): drm/panfrost: fix reference leak in
panfrost_job_hw_submit
pm_runtime_get_sync will increment pm usage counter even it

6
projects/Amlogic/patches/linux/amlogic-0028-FROMLIST-v1-drm-panfrost-Use-delayed-timer-as-defaul.patch
View File

@ -1,7 +1,7 @@
From bf90debfd857025cd854feee6bd5c3983db94f21 Mon Sep 17 00:00:00 2001
From 0e6e551be4fc9518b60f05a76f6b9a1360ab69b7 Mon Sep 17 00:00:00 2001
From: Lukasz Luba <lukasz.luba@arm.com>
Date: Tue, 12 Jan 2021 02:49:18 +0000
Subject: [PATCH 28/79] FROMLIST(v1): drm/panfrost: Use delayed timer as
Subject: [PATCH 28/76] FROMLIST(v1): drm/panfrost: Use delayed timer as
default in devfreq profile
Devfreq framework supports 2 modes for monitoring devices.
@ -14,7 +14,7 @@ Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 102a3dc146be..df8f2305b988 100644
index ffbf16506bb5..7c5ffc81dce1 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -76,6 +76,7 @@ static int panfrost_devfreq_get_dev_status(struct device *dev,

4
projects/Amlogic/patches/linux/amlogic-0029-FROMLIST-v1-drm-lima-fix-reference-leak-in-lima_pm_b.patch
View File

@ -1,7 +1,7 @@
From 792b4a7db1a6427d446be9da31c10ee1687f5e4c Mon Sep 17 00:00:00 2001
From 5f66ff0ab7f871dd56140777b1e2274d301f7e23 Mon Sep 17 00:00:00 2001
From: Qinglang Miao <miaoqinglang@huawei.com>
Date: Sat, 28 Nov 2020 16:39:27 +0000
Subject: [PATCH 29/79] FROMLIST(v1): drm/lima: fix reference leak in
Subject: [PATCH 29/76] FROMLIST(v1): drm/lima: fix reference leak in
lima_pm_busy
pm_runtime_get_sync will increment pm usage counter even it

86
projects/Amlogic/patches/linux/amlogic-0030-FROMLIST-v1-mmc-meson-gx-check-for-scatterlist-size-.patch
View File

@ -1,86 +0,0 @@
From eb85e9dd941793114aa1583a982999068ee93740 Mon Sep 17 00:00:00 2001
From: Dmitry Lebed <lebed.dmitry@gmail.com>
Date: Fri, 18 Dec 2020 08:49:32 +0000
Subject: [PATCH 30/79] FROMLIST(v1): mmc: meson-gx: check for scatterlist size
alignment in block mode
Enable SGDMA support for SD_IO_RW_EXTENDED and add proper check
for scatterlist size alignment in block mode.
According to documentation, in SDIO block mode meson-gx DMA could
only handle buffers with sizes that are multiples of SDIO block size.
Some SDIO drivers like brcmfmac use scatterlist API, but do not enforce
proper scatterlist buffer size alignemnt, this looks like a root cause
of non-working CMD53.
Some minor style fixes.
Signed-off-by: Dmitry Lebed <lebed.dmitry@gmail.com>
---
drivers/mmc/host/meson-gx-mmc.c | 37 ++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 13f6a2c0ed04..eb6c02bc4a02 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -227,7 +227,6 @@ static void meson_mmc_get_transfer_mode(struct mmc_host *mmc,
struct mmc_data *data = mrq->data;
struct scatterlist *sg;
int i;
- bool use_desc_chain_mode = true;
/*
* When Controller DMA cannot directly access DDR memory, disable
@@ -237,25 +236,33 @@ static void meson_mmc_get_transfer_mode(struct mmc_host *mmc,
if (host->dram_access_quirk)
return;
- /*
- * Broken SDIO with AP6255-based WiFi on Khadas VIM Pro has been
- * reported. For some strange reason this occurs in descriptor
- * chain mode only. So let's fall back to bounce buffer mode
- * for command SD_IO_RW_EXTENDED.
- */
- if (mrq->cmd->opcode == SD_IO_RW_EXTENDED)
- return;
+ if (data->blocks > 1) {
+ /*
+ * In block mode DMA descriptor format, "length" field indicates
+ * number of blocks and there is no way to pass DMA size that
+ * is not multiple of SDIO block size, making it impossible to
+ * tie more than one memory buffer with single SDIO block.
+ * Block mode sg buffer size should be aligned with SDIO block
+ * size, otherwise chain mode could not be used.
+ */
+ for_each_sg(data->sg, sg, data->sg_len, i) {
+ if (sg->length % data->blksz) {
+ WARN_ONCE(1, "unaligned sg len %u blksize %u\n",
+ sg->length, data->blksz);
+ return;
+ }
+ }
+ }
- for_each_sg(data->sg, sg, data->sg_len, i)
+ for_each_sg(data->sg, sg, data->sg_len, i) {
/* check for 8 byte alignment */
- if (sg->offset & 7) {
+ if (sg->offset % 8) {
WARN_ONCE(1, "unaligned scatterlist buffer\n");
- use_desc_chain_mode = false;
- break;
+ return;
}
+ }
- if (use_desc_chain_mode)
- data->host_cookie |= SD_EMMC_DESC_CHAIN_MODE;
+ data->host_cookie |= SD_EMMC_DESC_CHAIN_MODE;
}
static inline bool meson_mmc_desc_chain_mode(const struct mmc_data *data)
--
2.17.1

64
projects/Amlogic/patches/linux/amlogic-0030-FROMLIST-v2-drm-lima-add-governor-data-with-pre-defi.patch Normal file
View File

@ -0,0 +1,64 @@
From aa3efd8bd2329b37cf8913c11b37199bc45fd6fb Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 24 Jan 2021 11:27:35 +0000
Subject: [PATCH 30/76] FROMLIST(v2): drm/lima: add governor data with
pre-defined thresholds
This patch adapts the panfrost pre-defined thresholds change [0] to the
lima driver to improve real-world performance. The upthreshold value has
been set to ramp GPU frequency to max freq faster (compared to panfrost)
to compensate for the lower overall performance of utgard devices.
[0] https://patchwork.kernel.org/project/dri-devel/patch/20210121170445.19761-1-lukasz.luba@arm.com/
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/gpu/drm/lima/lima_devfreq.c | 10 +++++++++-
drivers/gpu/drm/lima/lima_devfreq.h | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c
index 5686ad4aaf7c..c9854315a0b5 100644
--- a/drivers/gpu/drm/lima/lima_devfreq.c
+++ b/drivers/gpu/drm/lima/lima_devfreq.c
@@ -163,8 +163,16 @@ int lima_devfreq_init(struct lima_device *ldev)
lima_devfreq_profile.initial_freq = cur_freq;
dev_pm_opp_put(opp);
+ /*
+ * Setup default thresholds for the simple_ondemand governor.
+ * The values are chosen based on experiments.
+ */
+ ldevfreq->gov_data.upthreshold = 30;
+ ldevfreq->gov_data.downdifferential = 5;
+
devfreq = devm_devfreq_add_device(dev, &lima_devfreq_profile,
- DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
+ DEVFREQ_GOV_SIMPLE_ONDEMAND,
+ &ldevfreq->gov_data);
if (IS_ERR(devfreq)) {
dev_err(dev, "Couldn't initialize GPU devfreq\n");
ret = PTR_ERR(devfreq);
diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h
index 2d9b3008ce77..b0c7c736e81a 100644
--- a/drivers/gpu/drm/lima/lima_devfreq.h
+++ b/drivers/gpu/drm/lima/lima_devfreq.h
@@ -4,6 +4,7 @@
#ifndef __LIMA_DEVFREQ_H__
#define __LIMA_DEVFREQ_H__
+#include <linux/devfreq.h>
#include <linux/spinlock.h>
#include <linux/ktime.h>
@@ -18,6 +19,7 @@ struct lima_devfreq {
struct opp_table *clkname_opp_table;
struct opp_table *regulators_opp_table;
struct thermal_cooling_device *cooling;
+ struct devfreq_simple_ondemand_data gov_data;
ktime_t busy_time;
ktime_t idle_time;
--
2.17.1

30
projects/Amlogic/patches/linux/amlogic-0031-FROMLIST-v1-drm-lima-Use-delayed-timer-as-default-in.patch Normal file
View File

@ -0,0 +1,30 @@
From 6f9828a65b5f4da498317a6a7d1c6639666a8efc Mon Sep 17 00:00:00 2001
From: Lukasz Luba <lukasz.luba@arm.com>
Date: Wed, 27 Jan 2021 11:36:36 +0000
Subject: [PATCH 31/76] FROMLIST(v1): drm/lima: Use delayed timer as default in
devfreq profile
Devfreq framework supports 2 modes for monitoring devices.
Use delayed timer as default instead of deferrable timer
in order to monitor the GPU status regardless of CPU idle.
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
---
drivers/gpu/drm/lima/lima_devfreq.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c
index c9854315a0b5..4f64940b9055 100644
--- a/drivers/gpu/drm/lima/lima_devfreq.c
+++ b/drivers/gpu/drm/lima/lima_devfreq.c
@@ -81,6 +81,7 @@ static int lima_devfreq_get_dev_status(struct device *dev,
}
static struct devfreq_dev_profile lima_devfreq_profile = {
+ .timer = DEVFREQ_TIMER_DELAYED,
.polling_ms = 50, /* ~3 frames */
.target = lima_devfreq_target,
.get_dev_status = lima_devfreq_get_dev_status,
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0031-FROMLIST-v1-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch → projects/Amlogic/patches/linux/amlogic-0032-FROMLIST-v1-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch
View File

@ -1,7 +1,7 @@
From dafd61f40996680aa2a8d2a2f897390ef246b638 Mon Sep 17 00:00:00 2001
From 1381befcde2460345c3c4b25e85dffa7d2dd1233 Mon Sep 17 00:00:00 2001
From: Amjad Ouled-Ameur <aouledameur@baylibre.com>
Date: Fri, 13 Nov 2020 07:45:15 +0000
Subject: [PATCH 31/79] FROMLIST(v1): phy: amlogic: phy-meson-gxl-usb2: fix
Subject: [PATCH 32/76] FROMLIST(v1): phy: amlogic: phy-meson-gxl-usb2: fix
shared reset controller use
Use reset_control_rearm() call if an error occurs in case

4
projects/Amlogic/patches/linux/amlogic-0032-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch → projects/Amlogic/patches/linux/amlogic-0033-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch
View File

@ -1,7 +1,7 @@
From 1cdf814d6c594292237fc777947db4249c4061a5 Mon Sep 17 00:00:00 2001
From e6a9357363650fd4d8174a1ff9ba245c597ece1f Mon Sep 17 00:00:00 2001
From: Amjad Ouled-Ameur <aouledameur@baylibre.com>
Date: Fri, 13 Nov 2020 07:46:15 +0000
Subject: [PATCH 32/79] FROMLIST(v1): usb: dwc3: meson-g12a: fix shared reset
Subject: [PATCH 33/76] FROMLIST(v1): usb: dwc3: meson-g12a: fix shared reset
control use
reset_control_(de)assert() calls are called on a shared reset line when

4
projects/Amlogic/patches/linux/amlogic-0033-FROMLIST-v1-ASoC-meson-Use-managed-DMA-buffer-alloca.patch → projects/Amlogic/patches/linux/amlogic-0034-FROMLIST-v1-ASoC-meson-Use-managed-DMA-buffer-alloca.patch
View File

@ -1,7 +1,7 @@
From b0f55b047ecb02796026c0038a3356f7c751eac8 Mon Sep 17 00:00:00 2001
From f2779a5b9d6c5f58bdc2c3fa7bd2899bd02c8723 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 21 Dec 2020 14:19:57 +0000
Subject: [PATCH 33/79] FROMLIST(v1): ASoC: meson: Use managed DMA buffer
Subject: [PATCH 34/76] FROMLIST(v1): ASoC: meson: Use managed DMA buffer
allocation
Using a managed buffer will pre-allocate the buffer using

90
projects/Amlogic/patches/linux/amlogic-0035-FROMLIST-v1-spi-nor-add-support-for-XT25F128B.patch Normal file
View File

@ -0,0 +1,90 @@
From 0694da394778d362654c518a08b6810a48b97e19 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 28 Jan 2021 09:43:36 +0000
Subject: [PATCH 35/76] FROMLIST(v1): spi-nor: add support for XT25F128B
This adds support for the XT25F128B as found on the RockPi4b SBC.
Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
---
This continues the efforts done in [1] & [2] that went stale. I've
tested this patch on my RockPi4b which only has the xt25f128b (and not
the xt25f32b as also propsed in [2]). I have tried to obtain a copy of
the datasheets but was unable to find them. Not sure whre you would get
them.
While [1] was already for the new spi-nor layout it was missing the bits
in the core.{c,h} files.
[1]: https://patchwork.ozlabs.org/project/linux-mtd/patch/CAMgqO2y9MYDj6antOaWLBRKU8vGEwqCB-Y1TkXTSWsmsed+W6A@mail.gmail.com/
[2]: https://patchwork.ozlabs.org/project/linux-mtd/patch/20200206171941.GA2398@makrotopia.org/
---
drivers/mtd/spi-nor/Makefile | 1 +
drivers/mtd/spi-nor/core.c | 1 +
drivers/mtd/spi-nor/core.h | 1 +
drivers/mtd/spi-nor/xtx.c | 16 ++++++++++++++++
4 files changed, 19 insertions(+)
create mode 100644 drivers/mtd/spi-nor/xtx.c
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 653923896205..3f7a52d7fa0b 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -17,6 +17,7 @@ spi-nor-objs += sst.o
spi-nor-objs += winbond.o
spi-nor-objs += xilinx.o
spi-nor-objs += xmc.o
+spi-nor-objs += xtx.o
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
obj-$(CONFIG_MTD_SPI_NOR) += controllers/
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 20df44b753da..46ec47dfac14 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2176,6 +2176,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_winbond,
&spi_nor_xilinx,
&spi_nor_xmc,
+ &spi_nor_xtx,
};
static const struct flash_info *
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index d631ee299de3..345ec7dc3bbb 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -425,6 +425,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
extern const struct spi_nor_manufacturer spi_nor_winbond;
extern const struct spi_nor_manufacturer spi_nor_xilinx;
extern const struct spi_nor_manufacturer spi_nor_xmc;
+extern const struct spi_nor_manufacturer spi_nor_xtx;
void spi_nor_spimem_setup_op(const struct spi_nor *nor,
struct spi_mem_op *op,
diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c
new file mode 100644
index 000000000000..a10102d8b3e2
--- /dev/null
+++ b/drivers/mtd/spi-nor/xtx.c
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/mtd/spi-nor.h>
+
+#include "core.h"
+
+static const struct flash_info xtx_parts[] = {
+ /* XTX (Shenzhen Xin Tian Xia Tech) */
+ { "xt25f128b", INFO(0x0b4018, 0, 64 * 1024, 256, SECT_4K) },
+};
+
+const struct spi_nor_manufacturer spi_nor_xtx = {
+ .name = "xtx",
+ .parts = xtx_parts,
+ .nparts = ARRAY_SIZE(xtx_parts),
+};
--
2.17.1

46
projects/Amlogic/patches/linux/amlogic-0036-FROMLIST-v1-arm64-dts-meson-fix-broken-wifi-node-for.patch Normal file
View File

@ -0,0 +1,46 @@
From 04b1ab152b6f130df44c8c327901431f8ef55fb1 Mon Sep 17 00:00:00 2001
From: Artem Lapkin <art@khadas.com>
Date: Fri, 29 Jan 2021 14:17:19 +0000
Subject: [PATCH 36/76] FROMLIST(v1): arm64: dts: meson: fix broken wifi node
for Khadas VIM3L
Move &sd_emmc_a node from /* */ commented area because cannot load wifi fw
without sd-uhs-sdr50 option on VIM3L
[ 11.686590] brcmfmac: brcmf_chip_cores_check: CPU core not detected
[ 11.696382] brcmfmac: brcmf_sdio_probe_attach: brcmf_chip_attach failed!
[ 11.706240] brcmfmac: brcmf_sdio_probe: brcmf_sdio_probe_attach failed
[ 11.715890] brcmfmac: brcmf_ops_sdio_probe: F2 error, probe failed -19...
[ 13.718424] brcmfmac: brcmf_chip_recognition: chip backplane type 15 is not supported
Fixes: f1bb924e8f5b ("arm64: dts: meson: fix mmc0 tuning error on Khadas VIM3")
Signed-off-by: Artem Lapkin <art@khadas.com>
---
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
index 4b517ca72059..29c785cf5c96 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
@@ -89,13 +89,13 @@
status = "okay";
};
-&sd_emmc_a {
- sd-uhs-sdr50;
-};
-
&usb {
phys = <&usb2_phy0>, <&usb2_phy1>;
phy-names = "usb2-phy0", "usb2-phy1";
};
*/
+&sd_emmc_a {
+ sd-uhs-sdr50;
+};
+
--
2.17.1

22
projects/Amlogic/patches/linux/amlogic-0051-dt-bindings-arm-amlogic-add-X96-AIR-bindings.patch → projects/Amlogic/patches/linux/amlogic-0037-FROMLIST-v2-dt-bindings-arm-amlogic-sort-SM1-binding.patch
View File

@ -1,29 +1,27 @@
From c8f3a392d540e454c57b8faf8ee69acab7b382e5 Mon Sep 17 00:00:00 2001
From 5f0307eb4cff55da386853518a0c893ce3a25e5a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 18 May 2020 23:23:40 +0000
Subject: [PATCH 51/79] dt-bindings: arm: amlogic: add X96-AIR bindings
Date: Tue, 19 Jan 2021 15:32:38 +0000
Subject: [PATCH 37/76] FROMLIST(v2): dt-bindings: arm: amlogic: sort SM1
bindings
Add the board bindings for the Amediatech X96-AIR STB which ships in
two variants distinguished by RAM size which corresponds to internal
(2GB) vs. external (4GB) Ethernet PHY configuration.
Sort the bindings before adding new SM1 devices.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/arm/amlogic.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 6bef60ddda64..52db715359ed 100644
index 6bef60ddda64..b21ba8ba23dd 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -164,9 +164,11 @@ properties:
@@ -164,9 +164,9 @@ properties:
- description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC
items:
- enum:
- - seirobotics,sei610
- - khadas,vim3l
+ - amediatech,x96-air-2g
+ - amediatech,x96-air-4g
- hardkernel,odroid-c4
+ - khadas,vim3l
+ - seirobotics,sei610

30
projects/Amlogic/patches/linux/amlogic-0038-FROMLIST-v2-arm64-dts-meson-sort-Amlogic-dtb-Makefil.patch Normal file
View File

@ -0,0 +1,30 @@
From 5c639a0f1b68fd54a88043d83f201359b3c3a79a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 19 Jan 2021 15:34:53 +0000
Subject: [PATCH 38/76] FROMLIST(v2): arm64: dts: meson: sort Amlogic dtb
Makefile
Sort the Makefile before adding new SM1 devices.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index dce41cd3f347..f3c8a85fe987 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -45,7 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
--
2.17.1

65
projects/Amlogic/patches/linux/amlogic-0058-arm64-dts-meson-convert-meson-sm1-odroid-c4-to-dtsi.patch → projects/Amlogic/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-convert-meson-sm1-odroid.patch
View File

@ -1,23 +1,25 @@
From f67fd1a6f673dbf4cf22656a887491566d314b6a Mon Sep 17 00:00:00 2001
From 2daf69b2b9acb20568d4fe3b0dbc92fa3569129a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 27 Dec 2020 14:54:44 +0000
Subject: [PATCH 58/79] arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi
Date: Fri, 29 Jan 2021 02:10:14 +0000
Subject: [PATCH 39/76] FROMLIST(v2): arm64: dts: meson: convert
meson-sm1-odroid-c4 to dtsi
Convert the ODRIOD-C4 dts to meson-sm1-odroid.dtsi and C4 board dts in
preparation for adding additional C4 family boards.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
.../boot/dts/amlogic/meson-sm1-odroid-c4.dts | 438 +----------------
.../boot/dts/amlogic/meson-sm1-odroid.dtsi | 447 ++++++++++++++++++
2 files changed, 449 insertions(+), 436 deletions(-)
.../boot/dts/amlogic/meson-sm1-odroid-c4.dts | 427 +----------------
.../boot/dts/amlogic/meson-sm1-odroid.dtsi | 441 ++++++++++++++++++
2 files changed, 442 insertions(+), 426 deletions(-)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
index a712273c905a..b10f9df212a7 100644
index eadd75e6e067..b2a4e823c1d8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
@@ -5,38 +5,16 @@
@@ -5,34 +5,12 @@
/dts-v1/;
@ -53,11 +55,6 @@ index a712273c905a..b10f9df212a7 100644
leds {
compatible = "gpio-leds";
- led-blue {
+ blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
@@ -45,96 +23,6 @@
};
};
@ -155,11 +152,10 @@ index a712273c905a..b10f9df212a7 100644
hub_5v: regulator-hub_5v {
compatible = "regulator-fixed";
regulator-name = "HUB_5V";
@@ -146,216 +34,9 @@
gpio = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
@@ -147,215 +35,12 @@
enable-active-high;
};
-
- usb_pwr_en: regulator-usb_pwr_en {
- compatible = "regulator-fixed";
- regulator-name = "USB_PWR_EN";
@ -201,9 +197,9 @@ index a712273c905a..b10f9df212a7 100644
- };
- };
-
- sound {
sound {
- compatible = "amlogic,axg-sound-card";
- model = "SM1-ODROID-C4";
model = "ODROID-C4";
- audio-aux-devs = <&tdmout_b>;
- audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
- "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -302,9 +298,9 @@ index a712273c905a..b10f9df212a7 100644
- interrupt-parent = <&gpio_intc>;
- /* MAC_INTR on GPIOZ_14 */
- interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
- };
-};
-
};
};
-&ethmac {
- pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
- pinctrl-names = "default";
@ -324,8 +320,8 @@ index a712273c905a..b10f9df212a7 100644
-
-&frddr_c {
- status = "okay";
};
-};
-
&gpio {
- gpio-line-names =
- /* GPIOZ */
@ -372,7 +368,7 @@ index a712273c905a..b10f9df212a7 100644
/*
* WARNING: The USB Hub on the Odroid-C4 needs a reset signal
* to be turned high in order to be detected by the USB Controller
@@ -370,121 +51,6 @@
@@ -370,120 +55,10 @@
};
};
@ -410,7 +406,7 @@ index a712273c905a..b10f9df212a7 100644
- pinctrl-names = "default";
linux,rc-map-name = "rc-odroid";
};
-
-&pwm_AO_cd {
- pinctrl-0 = <&pwm_ao_d_e_pins>;
- pinctrl-names = "default";
@ -490,16 +486,15 @@ index a712273c905a..b10f9df212a7 100644
- phy-supply = <&vcc_5v>;
-};
-
-&usb2_phy1 {
- /* Enable the hub which is connected to this port */
- phy-supply = <&hub_5v>;
-};
&usb2_phy1 {
/* Enable the hub which is connected to this port */
phy-supply = <&hub_5v>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
new file mode 100644
index 000000000000..49e1bb7a4294
index 000000000000..a66d55d93183
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -0,0 +1,447 @@
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
@ -663,7 +658,6 @@ index 000000000000..49e1bb7a4294
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "SM1-ODROID-C4";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -673,6 +667,7 @@ index 000000000000..49e1bb7a4294
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
@ -709,7 +704,6 @@ index 000000000000..49e1bb7a4294
+ /* hdmi glue */
+ dai-link-4 {
+ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+
+ codec {
+ sound-dai = <&hdmi_tx>;
+ };
@ -942,11 +936,6 @@ index 000000000000..49e1bb7a4294
+&usb2_phy0 {
+ phy-supply = <&vcc_5v>;
+};
+
+&usb2_phy1 {
+ /* Enable the hub which is connected to this port */
+ phy-supply = <&hub_5v>;
+};
--
2.17.1

13
projects/Amlogic/patches/linux/amlogic-0059-dt-bindings-arm-amlogic-add-ODROID-HC4-bindings.patch → projects/Amlogic/patches/linux/amlogic-0040-FROMLIST-v2-dt-bindings-arm-amlogic-add-ODROID-HC4-b.patch
View File

@ -1,7 +1,8 @@
From 0618c6b606c65954b587cfc624dbc77483e029fc Mon Sep 17 00:00:00 2001
From 46f0433454813a71768d4cf75c5a8c9aa812ab18 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 12 Dec 2020 05:44:14 +0000
Subject: [PATCH 59/79] dt-bindings: arm: amlogic: add ODROID-HC4 bindings
Subject: [PATCH 40/76] FROMLIST(v2): dt-bindings: arm: amlogic: add ODROID-HC4
bindings
Add the board bindings for the ODROID-HC4 device.
@ -11,12 +12,12 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 8561e1a17d6f..415fc1d351e1 100644
index b21ba8ba23dd..5f6769bf45bd 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -170,6 +170,7 @@ properties:
- cyx,a95xf3-air-2g
- cyx,a95xf3-air-4g
@@ -165,6 +165,7 @@ properties:
items:
- enum:
- hardkernel,odroid-c4
+ - hardkernel,odroid-hc4
- khadas,vim3l

74
projects/Amlogic/patches/linux/amlogic-0060-arm64-dts-meson-add-initial-device-tree-for-ODROID-H.patch → projects/Amlogic/patches/linux/amlogic-0041-FROMLIST-v2-arm64-dts-meson-add-initial-device-tree-.patch
View File

@ -1,41 +1,41 @@
From 1d5f22964f2c53708c43705c22c5049e41d0fbac Mon Sep 17 00:00:00 2001
From b83915242632804d629acaa105dde6c79ea1361b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 12 Dec 2020 05:48:47 +0000
Subject: [PATCH 60/79] arm64: dts: meson: add initial device-tree for
ODROID-HC4
Date: Fri, 29 Jan 2021 02:12:43 +0000
Subject: [PATCH 41/76] FROMLIST(v2): arm64: dts: meson: add initial
device-tree for ODROID-HC4
ODROID-HC4 is a derivative of the C4 with minor differences:
- 128MB SPI flash
- 16MB SPI-NOR flash
- 2x SATA ports via ASM1061 PCIe to SATA controller
- 7-pin header with SPI and I2C for optional 1-inch OLED display + RTC
- 7-pin header with SPI and I2C for 1-inch OLED display and RTC
- 1x USB 2.0 host port
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 82 +++++++++++++++++++
2 files changed, 83 insertions(+)
.../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 96 +++++++++++++++++++
2 files changed, 97 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 15e06e1ec51f..34420ffc5050 100644
index f3c8a85fe987..78a569d7fa20 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-2g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-4g.dtb
@@ -47,5 +47,6 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-2g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-4g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
new file mode 100644
index 000000000000..de534ae1406f
index 000000000000..bf15700c4b15
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -0,0 +1,82 @@
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Dongjin Kim <tobetter@gmail.com>
@ -49,6 +49,11 @@ index 000000000000..de534ae1406f
+ compatible = "hardkernel,odroid-hc4", "amlogic,sm1";
+ model = "Hardkernel ODROID-HC4";
+
+ aliases {
+ rtc0 = &rtc;
+ rtc1 = &vrtc;
+ };
+
+ fan0: pwm-fan {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
@ -56,16 +61,12 @@ index 000000000000..de534ae1406f
+ cooling-max-state = <3>;
+ cooling-levels = <0 120 170 220>;
+ pwms = <&pwm_cd 1 40000 0>;
+ fan-supply = <&vcc_5v>;
+ interrupt-parent = <&gpio_intc>;
+ interrupts = <84 IRQ_TYPE_EDGE_FALLING>;
+ pulses-per-revolutions = <2>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ blue {
+ led-blue {
+ color = <LED_COLOR_ID_BLUE>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
@ -73,20 +74,16 @@ index 000000000000..de534ae1406f
+ panic-indicator;
+ };
+
+ red {
+ led-red {
+ color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_POWER;
+ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ default-state = "on";
+ };
+ };
+
+ hub_5v: regulator-hub_5v {
+ compatible = "regulator-fixed";
+ regulator-name = "HUB_5V";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc_5v>;
+ sound {
+ model = "ODROID-HC4";
+ };
+};
+
@ -103,9 +100,22 @@ index 000000000000..de534ae1406f
+ linux,rc-map-name = "rc-odroid";
+};
+
+&pcie {
+ reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
+&i2c2 {
+ status = "okay";
+ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
+ pinctrl-names = "default";
+
+ rtc: rtc@51 {
+ status = "okay";
+ compatible = "nxp,pcf8563";
+ reg = <0x51>;
+ wakeup-source;
+ };
+};
+
+&pcie {
+ status = "okay";
+ reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
+};
+
+&pwm_cd {
@ -114,6 +124,10 @@ index 000000000000..de534ae1406f
+ pinctrl-0 = <&pwm_d_x6_pins>;
+};
+
+&sd_emmc_c {
+ status = "disabled";
+};
+
+&usb {
+ phys = <&usb2_phy0>, <&usb2_phy1>;
+ phy-names = "usb2-phy0", "usb2-phy1";

4
projects/Amlogic/patches/linux/amlogic-0034-WIP-drm-panfrost-Make-sure-MMU-context-lifetime-is-n.patch → projects/Amlogic/patches/linux/amlogic-0042-WIP-drm-panfrost-Make-sure-MMU-context-lifetime-is-n.patch
View File

@ -1,7 +1,7 @@
From a7786b82737f2ea71c58287d5c7ab6faba12f602 Mon Sep 17 00:00:00 2001
From 176ed28766085a6f74fe883418c27b67dc58ccff Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Tue, 4 Feb 2020 15:35:03 +0100
Subject: [PATCH 34/79] WIP: drm/panfrost: Make sure MMU context lifetime is
Subject: [PATCH 42/76] WIP: drm/panfrost: Make sure MMU context lifetime is
not bound to panfrost_priv
Jobs can be in-flight when the file descriptor is closed (either because

4
projects/Amlogic/patches/linux/amlogic-0035-WIP-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch → projects/Amlogic/patches/linux/amlogic-0043-WIP-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch
View File

@ -1,7 +1,7 @@
From 85a687a98eddfb5a77579e2350211a9fcb15bf69 Mon Sep 17 00:00:00 2001
From 029a03290c4ad5594bc800fa15d0ede1abb127f0 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:23 +0100
Subject: [PATCH 35/79] WIP: arm64: meson: add Amlogic Meson GX PM Suspend
Subject: [PATCH 43/76] WIP: arm64: meson: add Amlogic Meson GX PM Suspend
The Amlogic Meson GX SoCs uses a non-standard argument to the
PSCI CPU_SUSPEND call to enter system suspend.

10
projects/Amlogic/patches/linux/amlogic-0036-WIP-arm64-dts-meson-add-support-for-GX-PM-and-Virtua.patch → projects/Amlogic/patches/linux/amlogic-0044-WIP-arm64-dts-meson-add-support-for-GX-PM-and-Virtua.patch
View File

@ -1,7 +1,7 @@
From 87131b3b370f73a57aba13f73e4071a51702c8fa Mon Sep 17 00:00:00 2001
From b2e229ad94cfa0940baac8e6b15912d733fe68d4 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:25 +0100
Subject: [PATCH 36/79] WIP: arm64: dts: meson: add support for GX PM and
Subject: [PATCH 44/76] WIP: arm64: dts: meson: add support for GX PM and
Virtual RTC
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
@ -10,10 +10,10 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index ac6e99a9c95f..3823c0f25e7a 100644
index cf9eb7c8a6f0..8e3929e9cf42 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -216,6 +216,10 @@
@@ -215,6 +215,10 @@
};
};
@ -24,7 +24,7 @@ index ac6e99a9c95f..3823c0f25e7a 100644
efuse: efuse {
compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
#address-cells = <1>;
@@ -453,6 +457,11 @@
@@ -452,6 +456,11 @@
};
};

30
projects/Amlogic/patches/linux/amlogic-0045-WIP-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-V.patch Normal file
View File

@ -0,0 +1,30 @@
From e4dbfa91b5924f9a3421a95bd239f6c3789071f9 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 21 Jan 2021 01:35:36 +0000
Subject: [PATCH 45/76] WIP: arm64: dts: meson: add rtc/vrtc aliases to Khadas
VIM
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
while the onboard rtc chip claims /dev/rtc0.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index 60feac0179c0..df287b12975b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -29,6 +29,8 @@
aliases {
serial2 = &uart_AO_B;
ethernet0 = &ethmac;
+ rtc0 = &rtc;
+ rtc1 = &vrtc;
};
gpio-keys-polled {
--
2.17.1

8
projects/Amlogic/patches/linux/amlogic-0037-WIP-arm64-dts-meson-add-audio-playback-to-nexbox-a1.patch → projects/Amlogic/patches/linux/amlogic-0046-WIP-arm64-dts-meson-add-audio-playback-to-nexbox-a1.patch
View File

@ -1,7 +1,7 @@
From 173afaa69d1d3b373d43195073a5159d5f69fb28 Mon Sep 17 00:00:00 2001
From 6f2d6372b659434f8816584053d963ee89ce9746 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 07:23:05 +0000
Subject: [PATCH 37/79] WIP: arm64: dts: meson: add audio playback to nexbox-a1
Subject: [PATCH 46/76] WIP: arm64: dts: meson: add audio playback to nexbox-a1
Add initial support is limited to HDMI i2s and SPDIF (LPCM).
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 80 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index dfa7a37a1281..a5db3f67d33f 100644
index dfa7a37a1281..a8c9ffbd97a4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -10,6 +10,7 @@
@ -67,7 +67,7 @@ index dfa7a37a1281..a5db3f67d33f 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXM-NEXBOX-A1";
+ model = "NEXBOX-A1";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

197
projects/Amlogic/patches/linux/amlogic-0046-WIP-drm-bridge-dw-hdmi-i2s-HBR-audio-experiments.patch
View File

@ -1,197 +0,0 @@
From 66dcce54150521f90c493814c4e06fe02009a737 Mon Sep 17 00:00:00 2001
From: chewitt <christianshewitt@gmail.com>
Date: Tue, 7 Jul 2020 15:24:33 +0000
Subject: [PATCH 46/79] WIP: drm/bridge: dw-hdmi-i2s: HBR audio experiments
---
.../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 21 +++++++++++++++++--
drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 5 +++++
include/sound/hdmi-codec.h | 1 +
sound/soc/codecs/hdmi-codec.c | 4 +++-
sound/soc/meson/aiu-acodec-ctrl.c | 2 +-
sound/soc/meson/aiu-codec-ctrl.c | 2 +-
sound/soc/meson/aiu.h | 3 ++-
sound/soc/meson/axg-tdm.h | 3 ++-
sound/soc/meson/g12a-tohdmitx.c | 2 +-
9 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
index feb04f127b55..54cadf32b974 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
@@ -40,8 +40,11 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
{
struct dw_hdmi_i2s_audio_data *audio = data;
struct dw_hdmi *hdmi = audio->hdmi;
+ int sample_width = hparms->sample_width;
+ int ca = hparms->cea.channel_allocation;
u8 conf0 = 0;
u8 conf1 = 0;
+ u8 conf2 = 0;
u8 inputclkfs = 0;
/* it cares I2S only */
@@ -57,6 +60,17 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
inputclkfs = HDMI_AUD_INPUTCLKFS_64FS;
conf0 = (HDMI_AUD_CONF0_I2S_SELECT | HDMI_AUD_CONF0_I2S_EN0);
+ if (hparms->format == SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE) {
+ conf2 |= HDMI_AUD_CONF2_NLPCM;
+ if (hparms->channels == 8)
+ conf2 |= HDMI_AUD_CONF2_HBR;
+
+ sample_width = 21;
+ ca = 0;
+ }
+
+ hdmi_write(audio, conf2, HDMI_AUD_CONF2);
+
/* Enable the required i2s lanes */
switch (hparms->channels) {
case 7 ... 8:
@@ -70,10 +84,13 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
/* Fall-thru */
}
- switch (hparms->sample_width) {
+ switch (sample_width) {
case 16:
conf1 = HDMI_AUD_CONF1_WIDTH_16;
break;
+ case 21:
+ conf1 = HDMI_AUD_CONF1_WIDTH_21;
+ break;
case 24:
case 32:
conf1 = HDMI_AUD_CONF1_WIDTH_24;
@@ -104,7 +121,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate);
dw_hdmi_set_channel_status(hdmi, hparms->iec.status);
dw_hdmi_set_channel_count(hdmi, hparms->channels);
- dw_hdmi_set_channel_allocation(hdmi, hparms->cea.channel_allocation);
+ dw_hdmi_set_channel_allocation(hdmi, ca);
hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS);
hdmi_write(audio, conf0, HDMI_AUD_CONF0);
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
index 1999db05bc3b..bff849a336f7 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
@@ -917,8 +917,13 @@ enum {
HDMI_AUD_CONF1_MODE_BURST_1 = 0x60,
HDMI_AUD_CONF1_MODE_BURST_2 = 0x80,
HDMI_AUD_CONF1_WIDTH_16 = 0x10,
+ HDMI_AUD_CONF1_WIDTH_21 = 0x15,
HDMI_AUD_CONF1_WIDTH_24 = 0x18,
+/* AUD_CONF1 field values */
+ HDMI_AUD_CONF2_NLPCM = 0x02,
+ HDMI_AUD_CONF2_HBR = 0x01,
+
/* AUD_CTS3 field values */
HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5,
HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0,
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index b55970859a13..c3bd757375e9 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -45,6 +45,7 @@ struct hdmi_codec_params {
int sample_rate;
int sample_width;
int channels;
+ snd_pcm_format_t format;
};
typedef void (*hdmi_codec_plugged_cb)(struct device *dev,
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index d5fcc4db8284..0f32c81b5ea3 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -488,6 +488,7 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream,
hp.sample_width = params_width(params);
hp.sample_rate = params_rate(params);
hp.channels = params_channels(params);
+ hp.format = params_format(params);
return hcp->hcd.ops->hw_params(dai->dev->parent, hcp->hcd.data,
cf, &hp);
@@ -617,7 +618,8 @@ static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = {
SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE |\
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE |\
- SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE)
+ SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE |\
+ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dai *dai)
diff --git a/sound/soc/meson/aiu-acodec-ctrl.c b/sound/soc/meson/aiu-acodec-ctrl.c
index 7078197e0cc5..7b1356b4c891 100644
--- a/sound/soc/meson/aiu-acodec-ctrl.c
+++ b/sound/soc/meson/aiu-acodec-ctrl.c
@@ -114,7 +114,7 @@ static const struct snd_soc_dai_ops aiu_acodec_ctrl_output_ops = {
#define AIU_ACODEC_CTRL_FORMATS \
(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE | \
- SNDRV_PCM_FMTBIT_S32_LE)
+ SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
#define AIU_ACODEC_STREAM(xname, xsuffix, xchmax) \
{ \
diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
index 4b773d3e8b07..c41be9302afd 100644
--- a/sound/soc/meson/aiu-codec-ctrl.c
+++ b/sound/soc/meson/aiu-codec-ctrl.c
@@ -86,7 +86,7 @@ static const struct snd_soc_dai_ops aiu_codec_ctrl_output_ops = {
#define AIU_CODEC_CTRL_FORMATS \
(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE | \
- SNDRV_PCM_FMTBIT_S32_LE)
+ SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
#define AIU_CODEC_CTRL_STREAM(xname, xsuffix) \
{ \
diff --git a/sound/soc/meson/aiu.h b/sound/soc/meson/aiu.h
index 87aa19ac4af3..a52169d4ae9d 100644
--- a/sound/soc/meson/aiu.h
+++ b/sound/soc/meson/aiu.h
@@ -42,7 +42,8 @@ struct aiu {
#define AIU_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_LE | \
- SNDRV_PCM_FMTBIT_S24_LE)
+ SNDRV_PCM_FMTBIT_S24_LE | \
+ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
int aiu_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args,
diff --git a/sound/soc/meson/axg-tdm.h b/sound/soc/meson/axg-tdm.h
index 5774ce0916d4..b2218203023b 100644
--- a/sound/soc/meson/axg-tdm.h
+++ b/sound/soc/meson/axg-tdm.h
@@ -21,7 +21,8 @@
SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_LE | \
SNDRV_PCM_FMTBIT_S24_LE | \
- SNDRV_PCM_FMTBIT_S32_LE)
+ SNDRV_PCM_FMTBIT_S32_LE | \
+ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
struct axg_tdm_iface {
struct clk *sclk;
diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c
index 9b2b59536ced..ae07ca57623e 100644
--- a/sound/soc/meson/g12a-tohdmitx.c
+++ b/sound/soc/meson/g12a-tohdmitx.c
@@ -155,7 +155,7 @@ static const struct snd_soc_dai_ops g12a_tohdmitx_output_ops = {
#define TOHDMITX_I2S_FORMATS \
(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE | \
- SNDRV_PCM_FMTBIT_S32_LE)
+ SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
#define TOHDMITX_STREAM(xname, xsuffix, xfmt, xchmax) \
{ \
--
2.17.1

8
projects/Amlogic/patches/linux/amlogic-0038-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch → projects/Amlogic/patches/linux/amlogic-0047-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch
View File

@ -1,7 +1,7 @@
From 3b686d39b8d1778b44f72f9f5d196b2055d3e145 Mon Sep 17 00:00:00 2001
From cdb8cf05f06fdaaa0a10b71f6e70411edf8478df Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 07:52:47 +0000
Subject: [PATCH 38/79] WIP: arm64: dts: meson: add audio playback to p201
Subject: [PATCH 47/76] WIP: arm64: dts: meson: add audio playback to p201
Add initial audio support limited to HDMI i2s.
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 40 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
index 150a82f3b2d7..2e2bccbcfd43 100644
index 150a82f3b2d7..22bd0070146b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
@@ -8,10 +8,50 @@
@ -26,7 +26,7 @@ index 150a82f3b2d7..2e2bccbcfd43 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXBB-P201";
+ model = "P201";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

8
projects/Amlogic/patches/linux/amlogic-0039-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch → projects/Amlogic/patches/linux/amlogic-0048-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch
View File

@ -1,7 +1,7 @@
From 97eee44a18eae6703551cd69a40e0edb3e70067e Mon Sep 17 00:00:00 2001
From c2ca2c7ac6c3685be4e50cd1ace51a8dd23937ef Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 07:56:15 +0000
Subject: [PATCH 39/79] WIP: arm64: dts: meson: add audio playback to p200
Subject: [PATCH 48/76] WIP: arm64: dts: meson: add audio playback to p200
Add initial support limited to HDMI i2s and SPDIF (LPCM).
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 61 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 3c93d1898b40..a16dac72600d 100644
index 3c93d1898b40..27b3ab20f070 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -9,11 +9,19 @@
@ -41,7 +41,7 @@ index 3c93d1898b40..a16dac72600d 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXBB-P200";
+ model = "P200";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

8
projects/Amlogic/patches/linux/amlogic-0040-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch → projects/Amlogic/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch
View File

@ -1,7 +1,7 @@
From c1b47b0868145e1a6266440212831ee0f3e66ad9 Mon Sep 17 00:00:00 2001
From fb6fe8a77cbe9e1418345840c814486b9f0dadd3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 08:02:54 +0000
Subject: [PATCH 40/79] WIP: arm64: dts: meson: add audio playback to
Subject: [PATCH 49/76] WIP: arm64: dts: meson: add audio playback to
p212-s905x dtsi
Add initial audio support limited to HDMI i2s.
@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 40 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 05cb2f5e5c36..40776d42bf8e 100644
index 05cb2f5e5c36..5d41d93bd008 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -11,6 +11,7 @@
@ -30,7 +30,7 @@ index 05cb2f5e5c36..40776d42bf8e 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXL-S905X-P212";
+ model = "S905X-P212";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

8
projects/Amlogic/patches/linux/amlogic-0041-WIP-arm64-dts-meson-add-audio-playback-to-rbox-pro.patch → projects/Amlogic/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-audio-playback-to-rbox-pro.patch
View File

@ -1,7 +1,7 @@
From 79e65aaf2909fb6ebd9191cb77631e7347e1e221 Mon Sep 17 00:00:00 2001
From 9676847fa8622e8a4d5a6ecd332958db59ce8d22 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 08:13:00 +0000
Subject: [PATCH 41/79] WIP: arm64: dts: meson: add audio playback to rbox-pro
Subject: [PATCH 50/76] WIP: arm64: dts: meson: add audio playback to rbox-pro
Add initial support limited to HDMI i2s and SPDIF (LPCM).
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 80 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
index dde7cfe12cff..e6d1b3a3776f 100644
index dde7cfe12cff..0208c95e92cf 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
@@ -14,6 +14,7 @@
@ -69,7 +69,7 @@ index dde7cfe12cff..e6d1b3a3776f 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXM-RBOX-PRO";
+ model = "RBOX-PRO";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

8
projects/Amlogic/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch → projects/Amlogic/patches/linux/amlogic-0051-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch
View File

@ -1,7 +1,7 @@
From f4e3bb8586cc10951a97746019192b9830c1d848 Mon Sep 17 00:00:00 2001
From 6da9a634256de728600db6239dec4d714dbd0859 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 17 May 2020 05:00:55 +0000
Subject: [PATCH 42/79] WIP: arm64: dts: meson: add audio playback to u200
Subject: [PATCH 51/76] WIP: arm64: dts: meson: add audio playback to u200
Add initial support limited to HDMI i2s and SPDIF (LPCM).
@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 131 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index a26bfe72550f..dde7e258a184 100644
index a26bfe72550f..280f8159ebb1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -8,6 +8,7 @@
@ -44,7 +44,7 @@ index a26bfe72550f..dde7e258a184 100644
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "G12A-U200";
+ model = "U200";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",

8
projects/Amlogic/patches/linux/amlogic-0043-WIP-arm64-dts-meson-add-audio-playback-to-vega-s95-d.patch → projects/Amlogic/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-audio-playback-to-vega-s95-d.patch
View File

@ -1,7 +1,7 @@
From 7c504771602f2b10e4c3aca200178101a05f380f Mon Sep 17 00:00:00 2001
From c2a54c807910603e449bfe3719d2fb8d03e67d7c Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 16 May 2020 07:04:58 +0000
Subject: [PATCH 43/79] WIP: arm64: dts: meson: add audio playback to vega-s95
Subject: [PATCH 52/76] WIP: arm64: dts: meson: add audio playback to vega-s95
dtsi
Add initial support limited to HDMI i2s and SPDIF (LPCM).
@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 61 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 9b0b81f191f1..2976a9c42e11 100644
index 9b0b81f191f1..66daf3af34c3 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -4,6 +4,7 @@
@ -45,7 +45,7 @@ index 9b0b81f191f1..2976a9c42e11 100644
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXBB-VEGA-S95";
+ model = "VEGA-S95";
+ assigned-clocks = <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>,
+ <&clkc CLKID_MPLL2>;

4
projects/Amlogic/patches/linux/amlogic-0044-WIP-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch → projects/Amlogic/patches/linux/amlogic-0053-WIP-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch
View File

@ -1,7 +1,7 @@
From 88b8ee6b6c50088d1347808276a9fa37a15d5ae2 Mon Sep 17 00:00:00 2001
From c484291b43166b9c0ad1bb52361e0b869894fd61 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 15 Feb 2019 14:21:27 +0100
Subject: [PATCH 44/79] WIP: clk: meson: g12a: fix gp0 and hifi ranges
Subject: [PATCH 53/76] WIP: clk: meson: g12a: fix gp0 and hifi ranges
While some SoC samples are able to lock with a PLL factor of 55, others
samples can't. ATM, a minimum of 60 appears to work on all the samples

28
projects/Amlogic/patches/linux/amlogic-0053-dt-bindings-arm-amlogic-add-A95XF3-AIR-bindings.patch
View File

@ -1,28 +0,0 @@
From adf72caa726f67ee81acaee280f33cf213bd2232 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 29 Jun 2020 15:54:45 +0000
Subject: [PATCH 53/79] dt-bindings: arm: amlogic: add A95XF3-AIR bindings
Add the board bindings for the CYX A95XF3-AIR STB device.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 52db715359ed..01eb2889242a 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -166,6 +166,8 @@ properties:
- enum:
- amediatech,x96-air-2g
- amediatech,x96-air-4g
+ - cyx,a95xf3-air-2g
+ - cyx,a95xf3-air-4g
- hardkernel,odroid-c4
- khadas,vim3l
- seirobotics,sei610
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0045-WIP-clk-meson-g12a-fix-hifi-pll-lock.patch → projects/Amlogic/patches/linux/amlogic-0054-WIP-clk-meson-g12a-fix-hifi-pll-lock.patch
View File

@ -1,7 +1,7 @@
From a44a27bb6bda088ca9dcdf44f338b3694d69b6f4 Mon Sep 17 00:00:00 2001
From 4791022f0f1c7cc046d11d231c1bf6a3fef56ada Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Tue, 14 Apr 2020 10:45:08 +0200
Subject: [PATCH 45/79] WIP: clk: meson: g12a: fix hifi pll lock
Subject: [PATCH 54/76] WIP: clk: meson: g12a: fix hifi pll lock
The HIFI pll of the g12a sometimes takes a long time to report the lock in
HIFI_PLL_CNTL0 bit 31. The would eventually be reported but the delay may

6
projects/Amlogic/patches/linux/amlogic-0047-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch → projects/Amlogic/patches/linux/amlogic-0055-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch
View File

@ -1,7 +1,7 @@
From 6e623ead537a5b94302b52a80063e1996f46a299 Mon Sep 17 00:00:00 2001
From 22499cd4c3070943e616b2e96a27144ddc33879a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 23 Dec 2018 02:24:38 +0100
Subject: [PATCH 47/79] WIP: ASoC: hdmi-codec: reorder channel allocation list
Subject: [PATCH 55/76] WIP: ASoC: hdmi-codec: reorder channel allocation list
Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().
@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
1 file changed, 77 insertions(+), 63 deletions(-)
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 0f32c81b5ea3..e7d9cc50a50b 100644
index 0f3ac22f2cf8..9f7573cbfaf4 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -189,84 +189,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {

4
projects/Amlogic/patches/linux/amlogic-0048-WIP-ASoC-meson-aiu-encoder-spdif-implement-the-.mute.patch → projects/Amlogic/patches/linux/amlogic-0056-WIP-ASoC-meson-aiu-encoder-spdif-implement-the-.mute.patch
View File

@ -1,7 +1,7 @@
From 2bd2fe6712c01e580ba2db2ee33a479594dd5cf8 Mon Sep 17 00:00:00 2001
From 21874177845354c9e7b6da77e8ac5efba3a17615 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 23 Dec 2020 02:45:27 +0100
Subject: [PATCH 48/79] WIP: ASoC: meson: aiu: encoder-spdif: implement the
Subject: [PATCH 56/76] WIP: ASoC: meson: aiu: encoder-spdif: implement the
.mute_stream callback
Implement the .mute_stream callback based on code from the vendor

8
projects/Amlogic/patches/linux/amlogic-0049-WIP-ASoC-meson-aiu-encoder-i2s-implement-the-.mute_s.patch → projects/Amlogic/patches/linux/amlogic-0057-WIP-ASoC-meson-aiu-encoder-i2s-implement-the-.mute_s.patch
View File

@ -1,7 +1,7 @@
From 9d17f788c4cd42773dbcbd5bda46d78f761bb138 Mon Sep 17 00:00:00 2001
From 32e6676f1f1fbff63c99d7257c763e6c1436eb7b Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 23 Dec 2020 02:46:54 +0100
Subject: [PATCH 49/79] WIP: ASoC: meson: aiu: encoder-i2s: implement the
Subject: [PATCH 57/76] WIP: ASoC: meson: aiu: encoder-i2s: implement the
.mute_stream callback
Implement the .mute_stream callback based on the code from the vendor
@ -53,10 +53,10 @@ index 932224552146..d6aea7797641 100644
};
diff --git a/sound/soc/meson/aiu.h b/sound/soc/meson/aiu.h
index a52169d4ae9d..fbf6f88a41be 100644
index 87aa19ac4af3..47acf97d8034 100644
--- a/sound/soc/meson/aiu.h
+++ b/sound/soc/meson/aiu.h
@@ -67,6 +67,7 @@ extern const struct snd_soc_dai_ops aiu_encoder_spdif_dai_ops;
@@ -66,6 +66,7 @@ extern const struct snd_soc_dai_ops aiu_encoder_spdif_dai_ops;
#define AIU_958_CHSTAT_L0 0x020
#define AIU_958_CHSTAT_L1 0x024
#define AIU_958_CTRL 0x028

59
projects/Amlogic/patches/linux/amlogic-0058-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch Normal file
View File

@ -0,0 +1,59 @@
From 7facee7aa5ad08b0f38da7784d6a71652a53f0cb Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 14 Jan 2021 17:43:02 +0100
Subject: [PATCH 58/76] WIP: mmc: meson-gx-mmc: set core clock phase to 270
degres for AXG compatible controllers
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/mmc/host/meson-gx-mmc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 13f6a2c0ed04..073d5bf41aef 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -38,6 +38,7 @@
#define CLK_RX_PHASE_MASK GENMASK(13, 12)
#define CLK_PHASE_0 0
#define CLK_PHASE_180 2
+#define CLK_PHASE_270 3
#define CLK_V2_TX_DELAY_MASK GENMASK(19, 16)
#define CLK_V2_RX_DELAY_MASK GENMASK(23, 20)
#define CLK_V2_ALWAYS_ON BIT(24)
@@ -136,6 +137,7 @@ struct meson_mmc_data {
unsigned int rx_delay_mask;
unsigned int always_on;
unsigned int adjust;
+ unsigned int clk_core_phase;
};
struct sd_emmc_desc {
@@ -414,7 +416,7 @@ static int meson_mmc_clk_init(struct meson_host *host)
/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
clk_reg = CLK_ALWAYS_ON(host);
clk_reg |= CLK_DIV_MASK;
- clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, CLK_PHASE_180);
+ clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, host->data->clk_core_phase);
clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, CLK_PHASE_0);
clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, CLK_PHASE_0);
writel(clk_reg, host->regs + SD_EMMC_CLOCK);
@@ -1240,6 +1242,7 @@ static const struct meson_mmc_data meson_gx_data = {
.rx_delay_mask = CLK_V2_RX_DELAY_MASK,
.always_on = CLK_V2_ALWAYS_ON,
.adjust = SD_EMMC_ADJUST,
+ .clk_core_phase = CLK_PHASE_180,
};
static const struct meson_mmc_data meson_axg_data = {
@@ -1247,6 +1250,7 @@ static const struct meson_mmc_data meson_axg_data = {
.rx_delay_mask = CLK_V3_RX_DELAY_MASK,
.always_on = CLK_V3_ALWAYS_ON,
.adjust = SD_EMMC_V3_ADJUST,
+ .clk_core_phase = CLK_PHASE_270,
};
static const struct of_device_id meson_mmc_of_match[] = {
--
2.17.1

41
projects/Amlogic/patches/linux/amlogic-0059-arm64-dts-meson-add-spifc-node-to-ODROID-HC4.patch Normal file
View File

@ -0,0 +1,41 @@
From da773d3b59dbd63db43576bfa1b0a6a3da252342 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 28 Jan 2021 17:15:22 +0000
Subject: [PATCH 59/76] arm64: dts: meson: add spifc node to ODROID-HC4
Add a node for the XT25F128B SPI-NOR flash to make it accessible
from Linux.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index bf15700c4b15..5268d064ba1b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -90,6 +90,20 @@
status = "disabled";
};
+&spifc {
+ status = "okay";
+ pinctrl-0 = <&nor_pins>;
+ pinctrl-names = "default";
+
+ xt25f128b: spi-flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <104000000>;
+ };
+};
+
&usb {
phys = <&usb2_phy0>, <&usb2_phy1>;
phy-names = "usb2-phy0", "usb2-phy1";
--
2.17.1

8
projects/Amlogic/patches/linux/amlogic-0061-dt-bindings-arm-amlogic-add-Bananapi-BPI-M5-bindings.patch → projects/Amlogic/patches/linux/amlogic-0060-dt-bindings-arm-amlogic-add-Bananapi-BPI-M5-bindings.patch
View File

@ -1,7 +1,7 @@
From 9dc04abb2eaf903941d11bd8f02b21b3981cc56e Mon Sep 17 00:00:00 2001
From fe4777109f2e53cb51ba148454dd50eca3bf59cb Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 27 Dec 2020 15:27:44 +0000
Subject: [PATCH 61/79] dt-bindings: arm: amlogic: add Bananapi BPI-M5 bindings
Subject: [PATCH 60/76] dt-bindings: arm: amlogic: add Bananapi BPI-M5 bindings
Add the board bindings for the Sinovoip (Bananapi) BPI-M5 device.
@ -11,10 +11,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 415fc1d351e1..ec93a9d664bc 100644
index 5f6769bf45bd..41b22a406423 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -173,6 +173,7 @@ properties:
@@ -168,6 +168,7 @@ properties:
- hardkernel,odroid-hc4
- khadas,vim3l
- seirobotics,sei610

12
projects/Amlogic/patches/linux/amlogic-0062-arm64-dts-meson-add-initial-device-tree-for-Bananapi.patch → projects/Amlogic/patches/linux/amlogic-0061-arm64-dts-meson-add-initial-device-tree-for-Bananapi.patch
View File

@ -1,7 +1,7 @@
From 916b650e3ed3b94f5fb45fed562c1f8a9d18ae49 Mon Sep 17 00:00:00 2001
From 3110595efb17f414c95efdf81269f3e794c0e6b2 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 27 Dec 2020 15:11:59 +0000
Subject: [PATCH 62/79] arm64: dts: meson: add initial device-tree for Bananapi
Subject: [PATCH 61/76] arm64: dts: meson: add initial device-tree for Bananapi
BPI-M5
The Bananapi Wiki links to Amlogic BSP kernel sources which show [0]
@ -23,13 +23,13 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 34420ffc5050..e56888e568cd 100644
index 78a569d7fa20..3cf6699b4f30 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-2g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-4g.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb

29
projects/Amlogic/patches/linux/amlogic-0062-dt-bindings-arm-amlogic-add-support-for-the-Minix-NE.patch Normal file
View File

@ -0,0 +1,29 @@
From 90b781f9440f5ee9abc66a5f4c9a1358a82a26bd Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 29 Jan 2021 04:46:21 +0000
Subject: [PATCH 62/76] dt-bindings: arm: amlogic: add support for the Minix
NEO U9-H
The Minix NEO U9-H is a small form-factor Android STB based on the
Amlogic Q200 reference board with an S912 chip.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 41b22a406423..4ab110d6b3f0 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -120,6 +120,7 @@ properties:
- khadas,vim2
- kingnovel,r-box-pro
- libretech,aml-s912-pc
+ - minix,neo-u9h
- nexbox,a1
- tronsmart,vega-s96
- wetek,core2
--
2.17.1

177
projects/Amlogic/patches/linux/amlogic-0063-arm64-dts-meson-add-initial-device-tree-for-Minix-NE.patch Normal file
View File

@ -0,0 +1,177 @@
From 8539b594ffc44f215a7b26437fe5424fb5525ab9 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 19 Jan 2021 12:57:11 +0000
Subject: [PATCH 63/76] arm64: dts: meson: add initial device-tree for Minix
NEO U9-H
Minix NEO U9H is based on the Amlogic Q200 reference board with an
S912-H chip and the folloing specs:
- 2GB DDR3 RAM
- 16GB eMMC
- 10/100/1000 Base-T Ethernet
- AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1)
- RTC chip
- HDMI 2.1 video
- S/PDIF optical output
- ES8323 audio codec
- Analogue headphone output
- 3x USB 2.0 ports (1x OTG)
- IR receiver
- 1x Power LED (white)
- 1x Power button (rear)
- 1x Update/Reset button (underside)
- 1x micro SD card slot
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../dts/amlogic/meson-gxm-minix-neo-u9h.dts | 124 ++++++++++++++++++
2 files changed, 125 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 3cf6699b4f30..da11ef28a47b 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -38,6 +38,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts
new file mode 100644
index 000000000000..50c35b7606b9
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) Christian Hewitt <christianshewitt@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "meson-gxm.dtsi"
+#include "meson-gx-p23x-q20x.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+ compatible = "minix,neo-u9h", "amlogic,s912", "amlogic,meson-gxm";
+ model = "Minix Neo U9-H";
+
+ aliases {
+ rtc0 = &rtc;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ white {
+ color = <LED_COLOR_ID_WHITE>;
+ function = LED_FUNCTION_POWER;
+ gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ panic-indicator;
+ };
+ };
+
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 0>;
+ io-channel-names = "buttons";
+ keyup-threshold-microvolt = <1710000>;
+
+ button-function {
+ label = "update";
+ linux,code = <KEY_VENDOR>;
+ press-threshold-microvolt = <10000>;
+ };
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <100>;
+
+ button@0 {
+ label = "power";
+ linux,code = <KEY_POWER>;
+ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+&ethmac {
+ pinctrl-0 = <&eth_pins>;
+ pinctrl-names = "default";
+ phy-handle = <&external_phy>;
+ amlogic,tx-delay-ns = <2>;
+ phy-mode = "rgmii";
+};
+
+&external_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_15 */
+ interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&ir {
+ linux,rc-map-name = "rc-minix-neo";
+};
+
+&i2c_B {
+ status = "okay";
+ pinctrl-0 = <&i2c_b_pins>;
+ pinctrl-names = "default";
+
+ rtc: rtc@51 {
+ status = "okay";
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ clock-output-names = "xin32k";
+ wakeup-source;
+ };
+};
+
+&sd_emmc_a {
+ brcmf: wifi@1 {
+ reg = <1>;
+ compatible = "brcm,bcm4329-fmac";
+ };
+};
+
+&uart_A {
+ status = "okay";
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+
+ bluetooth {
+ compatible = "brcm,bcm43438-bt";
+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+ max-speed = <2000000>;
+ clocks = <&wifi32k>;
+ clock-names = "lpo";
+ };
+};
--
2.17.1

117
projects/Amlogic/patches/linux/amlogic-0064-media-rc-add-keymap-for-minix-neo-remote.patch Normal file
View File

@ -0,0 +1,117 @@
From 6f706f917237bcc53e742bc07bfe2984c56e9c3a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 19 Jan 2021 11:55:20 +0000
Subject: [PATCH 64/76] media: rc: add keymap for minix-neo remote
Add a keymap and bindings for the simple IR (NEC) remote used with
Minix 'NEO' branded Android STB devices.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../devicetree/bindings/media/rc.yaml | 1 +
drivers/media/rc/keymaps/Makefile | 1 +
drivers/media/rc/keymaps/rc-minix-neo.c | 55 +++++++++++++++++++
include/media/rc-map.h | 1 +
4 files changed, 58 insertions(+)
create mode 100644 drivers/media/rc/keymaps/rc-minix-neo.c
diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
index 946441b4e1a5..cbffdd6a470d 100644
--- a/Documentation/devicetree/bindings/media/rc.yaml
+++ b/Documentation/devicetree/bindings/media/rc.yaml
@@ -93,6 +93,7 @@ properties:
- rc-medion-x10
- rc-medion-x10-digitainer
- rc-medion-x10-or2x
+ - rc-minix-neo
- rc-msi-digivox-ii
- rc-msi-digivox-iii
- rc-msi-tvanywhere
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index b252a1d2ebd6..b7f53f44c5c8 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-medion-x10.o \
rc-medion-x10-digitainer.o \
rc-medion-x10-or2x.o \
+ rc-minix-neo.o \
rc-msi-digivox-ii.o \
rc-msi-digivox-iii.o \
rc-msi-tvanywhere.o \
diff --git a/drivers/media/rc/keymaps/rc-minix-neo.c b/drivers/media/rc/keymaps/rc-minix-neo.c
new file mode 100644
index 000000000000..9165af548ff1
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-minix-neo.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2021 Christian Hewitt <christianshewitt@gmail.com>
+
+#include <media/rc-map.h>
+#include <linux/module.h>
+
+//
+// Keytable for the Minix NEO remote control
+//
+
+static struct rc_map_table minix_neo[] = {
+
+ { 0x118, KEY_POWER },
+
+ { 0x146, KEY_UP },
+ { 0x116, KEY_DOWN },
+ { 0x147, KEY_LEFT },
+ { 0x115, KEY_RIGHT },
+ { 0x155, KEY_ENTER },
+
+ { 0x110, KEY_VOLUMEDOWN },
+ { 0x140, KEY_BACK },
+ { 0x114, KEY_VOLUMEUP },
+
+ { 0x10d, KEY_HOME },
+ { 0x104, KEY_MENU },
+ { 0x112, KEY_CONFIG },
+
+};
+
+static struct rc_map_list minix_neo_map = {
+ .map = {
+ .scan = minix_neo,
+ .size = ARRAY_SIZE(minix_neo),
+ .rc_proto = RC_PROTO_NEC,
+ .name = RC_MAP_MINIX_NEO,
+ }
+};
+
+static int __init init_rc_map_minix_neo(void)
+{
+ return rc_map_register(&minix_neo_map);
+}
+
+static void __exit exit_rc_map_minix_neo(void)
+{
+ rc_map_unregister(&minix_neo_map);
+}
+
+module_init(init_rc_map_minix_neo)
+module_exit(exit_rc_map_minix_neo)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 999b750bc6b8..a6fca9cc761f 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -273,6 +273,7 @@ struct rc_map *rc_map_get(const char *name);
#define RC_MAP_MEDION_X10 "rc-medion-x10"
#define RC_MAP_MEDION_X10_DIGITAINER "rc-medion-x10-digitainer"
#define RC_MAP_MEDION_X10_OR2X "rc-medion-x10-or2x"
+#define RC_MAP_MINIX_NEO "rc-minix-neo"
#define RC_MAP_MSI_DIGIVOX_II "rc-msi-digivox-ii"
#define RC_MAP_MSI_DIGIVOX_III "rc-msi-digivox-iii"
#define RC_MAP_MSI_TVANYWHERE "rc-msi-tvanywhere"
--
2.17.1

46
projects/Amlogic/patches/linux/amlogic-0050-arm64-dts-meson-add-common-SM1-ac2xx-dtsi.patch → projects/Amlogic/patches/linux/amlogic-0065-arm64-dts-meson-add-common-SM1-ac2xx-dtsi.patch
View File

@ -1,37 +1,24 @@
From 12638bcb1388efa54e3a32b13162f3986d4375b3 Mon Sep 17 00:00:00 2001
From c5708fd4ba0bf0e94b8cd12e114341069273f945 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 24 Jun 2020 12:41:46 +0000
Subject: [PATCH 50/79] arm64: dts: meson: add common SM1 ac2xx dtsi
Subject: [PATCH 65/76] arm64: dts: meson: add common SM1 ac2xx dtsi
Add a common dtsi for Android STB devices based on the Amlogic S905X3
(AC213/AC214) and S905D3 (AC201/AC202) reference designs. The dtsi is
loosely based on the existing SEI610 device-tree.
Popular SS905X3/D3 devices often ship in three configurations:
- 2GB/16GB with 10/100 internal PHY ethernet
- 4GB/32GB with 1GB external PHY ethernet
- 4GB/64GB with 1GB external PHY ethernet
Device dts filenames based on the common dtsi should include a 2g/4g
suffix, as this helps users to select a device-tree that matches the
Ethernet PHY spec for their device, e.g.
- meson-sm1-tvbox-2g.dts
- meson-sm1-tvbox-4g.dts
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 285 ++++++++++++++++++
1 file changed, 285 insertions(+)
.../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 298 ++++++++++++++++++
1 file changed, 298 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
new file mode 100644
index 000000000000..4b0439007251
index 000000000000..b3872983b5ce
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
@@ -0,0 +1,285 @@
@@ -0,0 +1,298 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre SAS. All rights reserved.
@ -62,6 +49,16 @@ index 000000000000..4b0439007251
+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+ };
+
+ cvbs-connector {
+ compatible = "composite-video-connector";
+
+ port {
+ cvbs_connector_in: endpoint {
+ remote-endpoint = <&cvbs_vdac_out>;
+ };
+ };
+ };
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
@ -114,9 +111,6 @@ index 000000000000..4b0439007251
+ };
+
+ vddcpu: regulator-vddcpu {
+ /*
+ * SY8120B1ABC DC/DC Regulator.
+ */
+ compatible = "pwm-regulator";
+
+ regulator-name = "VDDCPU";
@ -198,6 +192,12 @@ index 000000000000..4b0439007251
+ clock-latency = <50000>;
+};
+
+&cvbs_vdac_port {
+ cvbs_vdac_out: endpoint {
+ remote-endpoint = <&cvbs_connector_in>;
+ };
+};
+
+&hdmi_tx {
+ status = "okay";
+ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
@ -279,7 +279,7 @@ index 000000000000..4b0439007251
+
+ bus-width = <4>;
+ cap-sd-highspeed;
+ max-frequency = <35000000>;
+ max-frequency = <50000000>;
+ disable-wp;
+
+ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;

36
projects/Amlogic/patches/linux/amlogic-0066-arm64-dts-meson-fixes-for-WeTek-common-dtsi.patch
View File

@ -1,36 +0,0 @@
From b62dd6b8798b110fa1b7d0df4fc4b9f30cea4e68 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 29 Dec 2020 09:31:57 +0000
Subject: [PATCH 66/79] arm64: dts: meson: fixes for WeTek common dtsi
Add GPIO bindings (copied from Nanopi-K2/Odroid-C2) to resolve an issue
with Ethernet probing in mainline u-boot. Also add eee-broken.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
index a350fee1264d..9c2f3c43ee67 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -6,6 +6,7 @@
*/
#include "meson-gxbb.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
aliases {
@@ -145,6 +146,7 @@
eth_phy0: ethernet-phy@0 {
/* Realtek RTL8211F (0x001cc916) */
reg = <0>;
+ eee-broken-1000t;
reset-assert-us = <10000>;
reset-deassert-us = <80000>;
--
2.17.1

31
projects/Amlogic/patches/linux/amlogic-0066-dt-bindings-arm-amlogic-add-X96-AIR-bindings.patch Normal file
View File

@ -0,0 +1,31 @@
From aa8ed7aba1ef3e13c240bf14e52aedca3bbe0a40 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 18 May 2020 23:23:40 +0000
Subject: [PATCH 66/76] dt-bindings: arm: amlogic: add X96-AIR bindings
Add board bindings for the Amediatech X96-AIR STB which ships with
model variants distiguished by Ethernet configuration: models using
internal 10/100 PHY have a -100 suffix, while models using external
Gigabit PHY have a -1000 suffix.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 4ab110d6b3f0..bbf2b77fa5bf 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -165,6 +165,8 @@ properties:
- description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC
items:
- enum:
+ - amediatech,x96-air-100
+ - amediatech,x96-air-1000
- hardkernel,odroid-c4
- hardkernel,odroid-hc4
- khadas,vim3l
--
2.17.1

135
projects/Amlogic/patches/linux/amlogic-0052-arm64-dts-meson-add-initial-device-trees-for-X96-AIR.patch → projects/Amlogic/patches/linux/amlogic-0067-arm64-dts-meson-add-initial-device-trees-for-X96-AIR.patch
View File

@ -1,42 +1,57 @@
From 06e01fc50fe5f2795d0919f486ccdd2bad414cac Mon Sep 17 00:00:00 2001
From 579f1e7622e2dc32cddd755ed6352fc58c54bafc Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 24 Jun 2020 15:04:10 +0000
Subject: [PATCH 52/79] arm64: dts: meson: add initial device-trees for X96-AIR
Subject: [PATCH 67/76] arm64: dts: meson: add initial device-trees for X96-AIR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add device-trees for the 2GB/16GB and 4G(32/64GB) variants of the
X96-AIR Android STB device using the Amlogic S905X3 chip.
The Amediatek X96-AIR is based on Amlogic S905X3 reference board
designs and ships in multiple configurations:
X96-AIR uses the Realtek RTL8822CS SDIO WiFi+BT module.
– 4GB DDR3 + 64GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet
– 4GB DDR3 + 32GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet
– 4GB DDR3 + 32GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet
– 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet
...
- HDMI 2.1 video
- S/PDIF optical output
- AV output
- 2x USB 2.0 inc. OTG port
- 1x USB 3.0 port
- IR receiver
- 1x micro SD card slot (internal)
- 1x Reset/Update button (in AV jack)
- 7-segment VFD
The device-tree with -100 suffix supports models with 10/100 Ethernet
and with -1000 suffix supports models with Gigabit Ethernet.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 4 +-
.../boot/dts/amlogic/meson-sm1-x96-air-2g.dts | 112 +++++++++++++
.../boot/dts/amlogic/meson-sm1-x96-air-4g.dts | 155 ++++++++++++++++++
3 files changed, 270 insertions(+), 1 deletion(-)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
arch/arm64/boot/dts/amlogic/Makefile | 2 +
.../dts/amlogic/meson-sm1-x96-air-100.dts | 112 +++++++++++++++
.../dts/amlogic/meson-sm1-x96-air-1000.dts | 133 ++++++++++++++++++
3 files changed, 247 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-1000.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index dce41cd3f347..5473e29f9c36 100644
index da11ef28a47b..5de47ce6d8a4 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -45,7 +45,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
@@ -51,4 +51,6 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-2g.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-4g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-100.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-1000.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.dts
new file mode 100644
index 000000000000..cb4a7220bab1
index 000000000000..54a765c1948b
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.dts
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -50,12 +65,12 @@ index 000000000000..cb4a7220bab1
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+
+/ {
+ compatible = "amediatech,x96-air-2g", "amlogic,sm1";
+ compatible = "amediatech,x96-air-100", "amlogic,sm1";
+ model = "Shenzhen Amediatech Technology Co., Ltd X96 Air";
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "SM1-X96-AIR";
+ model = "X96-AIR";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -136,7 +151,7 @@ index 000000000000..cb4a7220bab1
+};
+
+&ir {
+ linux,rc-map-name = "rc-x96max";
+ linux,rc-map-name = "rc-beelink-gs1";
+};
+
+&tdmif_b {
@ -150,12 +165,12 @@ index 000000000000..cb4a7220bab1
+&tohdmitx {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-1000.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-1000.dts
new file mode 100644
index 000000000000..7c222e53f3c5
index 000000000000..8047c6b116fe
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
@@ -0,0 +1,155 @@
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-1000.dts
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre SAS. All rights reserved.
@ -168,12 +183,12 @@ index 000000000000..7c222e53f3c5
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+
+/ {
+ compatible = "amediatech,x96-air-4g", "amlogic,sm1";
+ compatible = "amediatech,x96-air-1000", "amlogic,sm1";
+ model = "Shenzhen Amediatech Technology Co., Ltd X96 Air";
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "SM1-X96-AIR";
+ model = "X96-AIR";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -235,23 +250,6 @@ index 000000000000..7c222e53f3c5
+ status = "okay";
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+ eee-broken-1000t;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&ethmac {
+ status = "okay";
+
@ -263,6 +261,22 @@ index 000000000000..7c222e53f3c5
+ rx-internal-delay-ps = <800>;
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&frddr_a {
+ status = "okay";
+};
@ -290,27 +304,6 @@ index 000000000000..7c222e53f3c5
+&tohdmitx {
+ status = "okay";
+};
+
+&uart_A {
+ status = "okay";
+
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+
+ bluetooth {
+ compatible = "realtek,rtl8822cs-bt";
+ interrupt-parent = <&gpio_intc>;
+ interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "host-wakeup";
+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+ max-speed = <2000000>;
+ clocks = <&wifi32k>;
+ clock-names = "lpo";
+ vbat-supply = <&vddao_3v3>;
+ vddio-supply = <&vddio_ao1v8>;
+ };
+};
--
2.17.1

26
projects/Amlogic/patches/linux/amlogic-0068-arm64-dts-meson-shorten-audio-card-name-for-sm1-odro.patch
View File

@ -1,26 +0,0 @@
From fc90aa1caec20cb75081e2055493fc87405d8183 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:38:08 +0000
Subject: [PATCH 68/79] arm64: dts: meson: shorten audio card name for
sm1-odroid dtsi
---
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index 49e1bb7a4294..dcf0c298a9bc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -161,7 +161,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-ODROID-C4";
+ model = "ODROID-C4";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--
2.17.1

31
projects/Amlogic/patches/linux/amlogic-0068-dt-bindings-arm-amlogic-add-A95XF3-AIR-bindings.patch Normal file
View File

@ -0,0 +1,31 @@
From 7dfa8ef0f2cfb1a64fecbd4cf01b14a2dc9bf32f Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 29 Jun 2020 15:54:45 +0000
Subject: [PATCH 68/76] dt-bindings: arm: amlogic: add A95XF3-AIR bindings
Add board bindings for the CYX A95XF3-AIR set-top box which ships
with model variants distiguished by Ethernet configuration: models
using internal 10/100 PHY have a -100 suffix, while models using
external Gigabit PHY have a -1000 suffix.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index bbf2b77fa5bf..6a6eec15747b 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -167,6 +167,8 @@ properties:
- enum:
- amediatech,x96-air-100
- amediatech,x96-air-1000
+ - cyx,a95xf3-air-100
+ - cyx,a95xf3-air-1000
- hardkernel,odroid-c4
- hardkernel,odroid-hc4
- khadas,vim3l
--
2.17.1

134
projects/Amlogic/patches/linux/amlogic-0054-arm64-dts-meson-sm1-add-initial-device-trees-for-A95.patch → projects/Amlogic/patches/linux/amlogic-0069-arm64-dts-meson-add-initial-device-trees-for-A95XF3-.patch
View File

@ -1,42 +1,61 @@
From bfd2ad16e39346e7b331c731f453f2d3a0ab2097 Mon Sep 17 00:00:00 2001
From f4bd8af01daa8367c68cb3cbbea348a02c6808db Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 3 Jun 2020 18:03:22 +0000
Subject: [PATCH 54/79] arm64: dts: meson-sm1: add initial device-trees for
Subject: [PATCH 69/76] arm64: dts: meson: add initial device-trees for
A95XF3-AIR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add device-trees for the 2GB/16GB and 4G(32/64GB) variants of the
X95XF3-AIR Android STB device using the Amlogic S905X3 chip.
The CYX A95XF3-AIR is based on Amlogic S905X3 reference board
designs and ships in multiple configurations:
X95XF3-AIR uses the MediaTek MT7668 SDIO WiFi+BT module.
– 4GB DDR3 + 64GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet
– 4GB DDR3 + 32GB eMMC + WiFi a/b/g/n/ac + BT + Gb Ethernet
– 2GB DDR3 + 16GB eMMC + WiFi b/g/n (no BT) + 10/100 Ethernet
...
- HDMI 2.1 video
- S/PDIF optical output
- AV output
- 1x USB 2.0 OTG port
- 1x USB 3.0 port
- IR receiver
- 1x micro SD card slot (internal)
- 1x Reset/Update button (in AV jack)
- 7-segment VFD
- Multicolour case LED 'arc'
The device-tree with -100 suffix supports models with 10/100 Ethernet
and with -1000 suffix supports models with Gigabit Ethernet.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 2 +
.../dts/amlogic/meson-sm1-a95xf3-air-2g.dts | 112 +++++++++++++
.../dts/amlogic/meson-sm1-a95xf3-air-4g.dts | 154 ++++++++++++++++++
3 files changed, 268 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
.../dts/amlogic/meson-sm1-a95xf3-air-100.dts | 108 +++++++++++++++
.../dts/amlogic/meson-sm1-a95xf3-air-1000.dts | 129 ++++++++++++++++++
3 files changed, 239 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 5473e29f9c36..29ae4c854d05 100644
index 5de47ce6d8a4..47a9d1f85596 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -45,6 +45,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
@@ -46,6 +46,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-2g.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-4g.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-100.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-1000.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts
new file mode 100644
index 000000000000..4f4c0fabd16d
index 000000000000..1d3820c4a2f5
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
@@ -0,0 +1,112 @@
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-100.dts
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre SAS. All rights reserved.
@ -49,12 +68,12 @@ index 000000000000..4f4c0fabd16d
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+
+/ {
+ compatible = "cyx,a95xf3-air-2g", "amlogic,sm1";
+ compatible = "cyx,a95xf3-air-100", "amlogic,sm1";
+ model = "Shenzhen CYX Industrial Co., Ltd A95XF3-AIR";
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "SM1-A95XF3-AIR";
+ model = "A95XF3-AIR";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -134,10 +153,6 @@ index 000000000000..4f4c0fabd16d
+ status = "okay";
+};
+
+&ir {
+ linux,rc-map-name = "rc-x96max";
+};
+
+&tdmif_b {
+ status = "okay";
+};
@ -149,12 +164,12 @@ index 000000000000..4f4c0fabd16d
+&tohdmitx {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts
new file mode 100644
index 000000000000..3315e22902dd
index 000000000000..c87d948fa3e6
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
@@ -0,0 +1,154 @@
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-1000.dts
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre SAS. All rights reserved.
@ -167,12 +182,12 @@ index 000000000000..3315e22902dd
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+
+/ {
+ compatible = "cyx,a95xf3-air-4g", "amlogic,sm1";
+ compatible = "cyx,a95xf3-air-1000", "amlogic,sm1";
+ model = "Shenzhen CYX Industrial Co., Ltd A95XF3-AIR";
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "SM1-A95XF3-AIR";
+ model = "A95XF3-AIR";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
@ -234,23 +249,6 @@ index 000000000000..3315e22902dd
+ status = "okay";
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+ eee-broken-1000t;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&ethmac {
+ status = "okay";
+
@ -262,6 +260,22 @@ index 000000000000..3315e22902dd
+ rx-internal-delay-ps = <800>;
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&frddr_a {
+ status = "okay";
+};
@ -274,10 +288,6 @@ index 000000000000..3315e22902dd
+ status = "okay";
+};
+
+&ir {
+ linux,rc-map-name = "rc-x96max";
+};
+
+&tdmif_b {
+ status = "okay";
+};
@ -289,26 +299,6 @@ index 000000000000..3315e22902dd
+&tohdmitx {
+ status = "okay";
+};
+
+&uart_A {
+ status = "okay";
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+
+ bluetooth {
+ compatible = "mediatek,mt7668u-bluetooth";
+ interrupt-parent = <&gpio_intc>;
+ interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "host-wakeup";
+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+ max-speed = <2000000>;
+ clocks = <&wifi32k>;
+ clock-names = "lpo";
+ vbat-supply = <&vddao_3v3>;
+ vddio-supply = <&vddio_ao1v8>;
+ };
+};
--
2.17.1

39
projects/Amlogic/patches/linux/amlogic-0069-arm64-dts-meson-shorten-audio-card-name-for-a95xf3.patch
View File

@ -1,39 +0,0 @@
From 86789a3dcc1c64acf41c8043cc338437cb2f8029 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 1 Jan 2021 08:09:05 +0000
Subject: [PATCH 69/79] arm64: dts: meson: shorten audio card name for a95xf3
---
arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
index 4f4c0fabd16d..ae4c08c26c8a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-2g.dts
@@ -15,7 +15,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-A95XF3-AIR";
+ model = "A95XF3-AIR";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
index 3315e22902dd..1a8a3871c12a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-4g.dts
@@ -15,7 +15,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-A95XF3-AIR";
+ model = "A95XF3-AIR";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--
2.17.1

26
projects/Amlogic/patches/linux/amlogic-0070-arm64-dts-meson-shorten-audio-card-name-for-gs-king-.patch
View File

@ -1,26 +0,0 @@
From 4325a6e823d49522d6e81f2a544fe2addd95ab36 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:35:53 +0000
Subject: [PATCH 70/79] arm64: dts: meson: shorten audio card name for
gs-king-x
---
arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
index c9d9dcb0cd65..211191f66344 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
@@ -35,7 +35,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "G12B-GSKING-X";
+ model = "GSKING-X";
audio-aux-devs = <&tdmout_a>;
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 1",
"TDMOUT_A IN 1", "FRDDR_B OUT 1",
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0063-dt-bindings-vendor-prefixes-add-haochuangyi-prefix.patch → projects/Amlogic/patches/linux/amlogic-0070-dt-bindings-vendor-prefixes-add-haochuangyi-prefix.patch
View File

@ -1,7 +1,7 @@
From d3dd413e71e82bac7aa5fb0ae300bc31fcae9f70 Mon Sep 17 00:00:00 2001
From bdc03977531cf69b8fd289928c2f52430b5806b9 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 12 Jan 2021 17:24:07 +0000
Subject: [PATCH 63/79] dt-bindings: vendor-prefixes: add haochuangyi prefix
Subject: [PATCH 70/76] dt-bindings: vendor-prefixes: add haochuangyi prefix
Shenzhen Haochuangyi Technology Co.,Ltd are a manufcaturer of Android
Set-Top Box devices.

26
projects/Amlogic/patches/linux/amlogic-0071-arm64-dts-meson-shorten-audio-card-name-for-nexbox-a.patch
View File

@ -1,26 +0,0 @@
From bd65a80ada819a6a07b070c11ffc4d8fd54d41c4 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:37:31 +0000
Subject: [PATCH 71/79] arm64: dts: meson: shorten audio card name for
nexbox-a1
---
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index a5db3f67d33f..a8c9ffbd97a4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -105,7 +105,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXM-NEXBOX-A1";
+ model = "NEXBOX-A1";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

10
projects/Amlogic/patches/linux/amlogic-0064-dt-bindings-arm-amlogic-add-H96-Max-bindings.patch → projects/Amlogic/patches/linux/amlogic-0071-dt-bindings-arm-amlogic-add-H96-Max-bindings.patch
View File

@ -1,9 +1,9 @@
From 2fc80a27662c0f9dd0eb0609035d35a5f995e807 Mon Sep 17 00:00:00 2001
From 96757d1ff05a6080df35ccd0d11394cfccc1d07c Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 12 Jan 2021 17:25:33 +0000
Subject: [PATCH 64/79] dt-bindings: arm: amlogic: add H96-Max bindings
Subject: [PATCH 71/76] dt-bindings: arm: amlogic: add H96-Max bindings
Add the board bindings for the Haochuangyi H96-Max STB device.
Add the board binding for the Haochuangyi H96-Max STB device.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -11,11 +11,11 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index ec93a9d664bc..7eb5a4fbcc0a 100644
index 6a6eec15747b..455cdd951c6e 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -171,6 +171,7 @@ properties:
- cyx,a95xf3-air-4g
- cyx,a95xf3-air-1000
- hardkernel,odroid-c4
- hardkernel,odroid-hc4
+ - haochuangyi,h96-max

76
projects/Amlogic/patches/linux/amlogic-0065-arm64-dts-meson-add-initial-device-tree-for-H96-Max.patch → projects/Amlogic/patches/linux/amlogic-0072-arm64-dts-meson-add-initial-device-tree-for-H96-Max.patch
View File

@ -1,25 +1,40 @@
From 6582fe86133be61cfda70064797aac5af54fbd62 Mon Sep 17 00:00:00 2001
From 00f29dbdd39eeee6f7696b96fbd19ac616bb5aec Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 12 Jan 2021 17:26:42 +0000
Subject: [PATCH 65/79] arm64: dts: meson: add initial device-tree for H96-Max
Subject: [PATCH 72/76] arm64: dts: meson: add initial device-tree for H96-Max
H96-Max is an Amlogic SM1 device based on the U215 reference design. It
ships in 3x variants with 4GB RAM and 32/64/128GB eMMC.
The Haochuangyi H96-Max is based on the Amlogic S905X3 reference
design with the following specs:
- 4GB DDR4 RAM
- 32/64/128GB eMMC
- HDMI 2.1 video
- S/PDIF optical output
- AV output
- 10/100/1000 Base-T Ethernet
- AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.1)
- 1x USB 2.0 OTG port
- 1x USB 3.0 port
- IR receiver
- 1x micro SD card slot (internal)
- 1x Reset/Update button (in AV jack)
- 7-segment VFD
Tested-by: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../boot/dts/amlogic/meson-sm1-h96-max.dts | 150 ++++++++++++++++++
2 files changed, 151 insertions(+)
.../boot/dts/amlogic/meson-sm1-h96-max.dts | 145 ++++++++++++++++++
2 files changed, 146 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index e56888e568cd..af8a23a8cd4a 100644
index 47a9d1f85596..7dd039173ef0 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-2g.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-4g.dtb
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-100.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-1000.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
@ -27,10 +42,10 @@ index e56888e568cd..af8a23a8cd4a 100644
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
new file mode 100644
index 000000000000..b539674297a7
index 000000000000..0f6660e68e72
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
@@ -0,0 +1,150 @@
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre SAS. All rights reserved.
@ -110,23 +125,6 @@ index 000000000000..b539674297a7
+ status = "okay";
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+ eee-broken-1000t;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&ethmac {
+ status = "okay";
+
@ -138,6 +136,22 @@ index 000000000000..b539674297a7
+ rx-internal-delay-ps = <800>;
+};
+
+&ext_mdio {
+ external_phy: ethernet-phy@0 {
+ /* Realtek RTL8211F (0x001cc916) */
+ reg = <0>;
+ max-speed = <1000>;
+
+ reset-assert-us = <10000>;
+ reset-deassert-us = <80000>;
+ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+ interrupt-parent = <&gpio_intc>;
+ /* MAC_INTR on GPIOZ_14 */
+ interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&frddr_a {
+ status = "okay";
+};
@ -150,10 +164,6 @@ index 000000000000..b539674297a7
+ status = "okay";
+};
+
+&ir {
+ linux,rc-map-name = "rc-x96max";
+};
+
+&tdmif_b {
+ status = "okay";
+};

25
projects/Amlogic/patches/linux/amlogic-0072-arm64-dts-meson-shorten-audio-card-name-for-p200.patch
View File

@ -1,25 +0,0 @@
From ecd16c14aa7c563d429c24a50fed4fc2c243124b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:36:27 +0000
Subject: [PATCH 72/79] arm64: dts: meson: shorten audio card name for p200
---
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index a16dac72600d..27b3ab20f070 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -68,7 +68,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXBB-P200";
+ model = "P200";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

25
projects/Amlogic/patches/linux/amlogic-0073-arm64-dts-meson-shorten-audio-card-name-for-p201.patch
View File

@ -1,25 +0,0 @@
From 43cbba1ca9e27d4f413cd3d72753f8950373db7e Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:36:40 +0000
Subject: [PATCH 73/79] arm64: dts: meson: shorten audio card name for p201
---
arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
index 2e2bccbcfd43..22bd0070146b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
@@ -16,7 +16,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXBB-P201";
+ model = "P201";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

8
projects/Amlogic/patches/linux/amlogic-0055-dt-bindings-arm-amlogic-add-support-for-the-Tanix-TX.patch → projects/Amlogic/patches/linux/amlogic-0073-dt-bindings-arm-amlogic-add-support-for-the-Tanix-TX.patch
View File

@ -1,7 +1,7 @@
From a0fb81f3acbb3324ff75117eabb80d34daf901cb Mon Sep 17 00:00:00 2001
From 57a9dd64706e5373eb8d4640c8592a6978aaab00 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 29 Feb 2020 15:13:02 +0000
Subject: [PATCH 55/79] dt-bindings: arm: amlogic: add support for the Tanix
Subject: [PATCH 73/76] dt-bindings: arm: amlogic: add support for the Tanix
TX5 Max
The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference
@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 01eb2889242a..8561e1a17d6f 100644
index 455cdd951c6e..e8aec4b53553 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -139,6 +139,7 @@ properties:
@@ -140,6 +140,7 @@ properties:
- amediatech,x96-max
- amlogic,u200
- seirobotics,sei510

10
projects/Amlogic/patches/linux/amlogic-0056-arm64-dts-meson-add-support-for-the-Tanix-TX5-Max.patch → projects/Amlogic/patches/linux/amlogic-0074-arm64-dts-meson-add-support-for-the-Tanix-TX5-Max.patch
View File

@ -1,7 +1,7 @@
From f8d652b231de095d2b11cb6b201dc155a6e4b975 Mon Sep 17 00:00:00 2001
From 0b95cf7438ed810360dfb2fd66b94acc2e1cb1af Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 20 Oct 2019 04:06:59 +0000
Subject: [PATCH 56/79] arm64: dts: meson: add support for the Tanix TX5 Max
Subject: [PATCH 74/76] arm64: dts: meson: add support for the Tanix TX5 Max
The Tanix TX5 Max is based on the Amlogic U200 reference design
using the S905X2 chipset. Hardware specification:
@ -25,7 +25,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 29ae4c854d05..d423aafbdf07 100644
index 7dd039173ef0..7d8586c718a1 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -1,6 +1,7 @@
@ -38,7 +38,7 @@ index 29ae4c854d05..d423aafbdf07 100644
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
new file mode 100644
index 000000000000..5bf5392b8d85
index 000000000000..0e55427ca398
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
@@ -0,0 +1,481 @@
@ -201,7 +201,7 @@ index 000000000000..5bf5392b8d85
+
+ sound {
+ compatible = "amlogic,axg-sound-card";
+ model = "G12A-TANIX-TX5MAX";
+ model = "TANIX-TX5MAX";
+ audio-aux-devs = <&tdmout_b>;
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",

25
projects/Amlogic/patches/linux/amlogic-0074-arm64-dts-meson-shorten-audio-card-name-for-p212.patch
View File

@ -1,25 +0,0 @@
From 1372c9944c5d691a1bc86287fd98df0b1fc3d918 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:37:16 +0000
Subject: [PATCH 74/79] arm64: dts: meson: shorten audio card name for p212
---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 40776d42bf8e..5d41d93bd008 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -89,7 +89,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXL-S905X-P212";
+ model = "S905X-P212";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

8
projects/Amlogic/patches/linux/amlogic-0057-arm64-dts-meson-add-multiple-MeCool-device-trees.patch → projects/Amlogic/patches/linux/amlogic-0075-arm64-dts-meson-add-multiple-MeCool-device-trees.patch
View File

@ -1,7 +1,7 @@
From abee17acade1c748cca7f0c01fdc27ba33cf5b4d Mon Sep 17 00:00:00 2001
From b83ca69b0637b7abe386b88b1221118e48cdcd0a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 21 Oct 2019 03:58:06 +0000
Subject: [PATCH 57/79] arm64: dts: meson: add multiple MeCool device trees
Subject: [PATCH 75/76] arm64: dts: meson: add multiple MeCool device trees
This adds initial device trees for a range of MeCool devices based on various
Amlogic GXBB, GXL and GXM reference designs. The current purpose is to allow
@ -28,7 +28,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index d423aafbdf07..15e06e1ec51f 100644
index 7d8586c718a1..3e72b2ad3a2d 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -13,6 +13,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
@ -56,9 +56,9 @@ index d423aafbdf07..15e06e1ec51f 100644
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
new file mode 100644
index 000000000000..0c27f7e67d5a

25
projects/Amlogic/patches/linux/amlogic-0075-arm64-dts-meson-shorten-audio-card-name-for-rbox-pro.patch
View File

@ -1,25 +0,0 @@
From 2e1691564492dff385a201e62c22471a09d9088a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:37:47 +0000
Subject: [PATCH 75/79] arm64: dts: meson: shorten audio card name for rbox-pro
---
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
index e6d1b3a3776f..0208c95e92cf 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
@@ -120,7 +120,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXM-RBOX-PRO";
+ model = "RBOX-PRO";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

68
projects/Amlogic/patches/linux/amlogic-0076-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch Normal file
View File

@ -0,0 +1,68 @@
From f2ef96d52be1a07552354084029747969f0a561b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 29 Dec 2020 09:31:57 +0000
Subject: [PATCH 76/76] arm64: dts: meson: fixups for WeTek common dtsi
Minor changes that result from work on mainline u-boot support, closer
study of vendor 3.14 device-tree, and access to vendor schematics:
- Add missing GPIO binding
- Add higher max-freq to SDIO and SD
- Add higher rates to SDIO
- Use updated LED bindings
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
index a350fee1264d..8c6453fd130f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -6,6 +6,8 @@
*/
#include "meson-gxbb.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
/ {
aliases {
@@ -25,8 +27,10 @@
leds {
compatible = "gpio-leds";
- led-system {
- label = "wetek-play:system-status";
+ blue {
+ /* red in suspend or power-off */
+ color = <LED_COLOR_ID_BLUE>;
+ function = LED_FUNCTION_POWER;
gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
default-state = "on";
panic-indicator;
@@ -199,7 +203,10 @@
bus-width = <4>;
cap-sd-highspeed;
- max-frequency = <50000000>;
+ sd-uhs-sdr12;
+ sd-uhs-sdr25;
+ sd-uhs-sdr50;
+ max-frequency = <200000000>;
non-removable;
disable-wp;
@@ -227,7 +234,7 @@
bus-width = <4>;
cap-sd-highspeed;
- max-frequency = <50000000>;
+ max-frequency = <100000000>;
disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
--
2.17.1

26
projects/Amlogic/patches/linux/amlogic-0076-arm64-dts-meson-shorten-audio-card-name-for-tanix-tx.patch
View File

@ -1,26 +0,0 @@
From 03f626c86f3205937de9684f5aa2aba813460bea Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:35:22 +0000
Subject: [PATCH 76/79] arm64: dts: meson: shorten audio card name for
tanix-tx5
---
arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
index 5bf5392b8d85..0e55427ca398 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
@@ -157,7 +157,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "G12A-TANIX-TX5MAX";
+ model = "TANIX-TX5MAX";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--
2.17.1

25
projects/Amlogic/patches/linux/amlogic-0077-arm64-dts-meson-shorten-audio-card-name-for-u200.patch
View File

@ -1,25 +0,0 @@
From 3f664968e1ef6d3a80b0eff4dbc122dea82159af Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:35:37 +0000
Subject: [PATCH 77/79] arm64: dts: meson: shorten audio card name for u200
---
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index dde7e258a184..280f8159ebb1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -159,7 +159,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "G12A-U200";
+ model = "U200";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--
2.17.1

25
projects/Amlogic/patches/linux/amlogic-0078-arm64-dts-meson-shorten-audio-card-name-for-vega-s95.patch
View File

@ -1,25 +0,0 @@
From 02440351a2d1d8cc1e20bd6b4c44c8f9ff6e9ceb Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 16:36:57 +0000
Subject: [PATCH 78/79] arm64: dts: meson: shorten audio card name for vega-s95
---
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 2976a9c42e11..66daf3af34c3 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -108,7 +108,7 @@
sound {
compatible = "amlogic,gx-sound-card";
- model = "GXBB-VEGA-S95";
+ model = "VEGA-S95";
assigned-clocks = <&clkc CLKID_MPLL0>,
<&clkc CLKID_MPLL1>,
<&clkc CLKID_MPLL2>;
--
2.17.1

39
projects/Amlogic/patches/linux/amlogic-0079-arm64-dts-meson-shorten-audio-card-name-for-x96-air.patch
View File

@ -1,39 +0,0 @@
From ddf584208c6e5d46f8b4c40f9c65c172d4e93eee Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 1 Jan 2021 08:09:32 +0000
Subject: [PATCH 79/79] arm64: dts: meson: shorten audio card name for x96-air
---
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
index cb4a7220bab1..600c3d20c4b9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-2g.dts
@@ -15,7 +15,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-X96-AIR";
+ model = "X96-AIR";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
index 7c222e53f3c5..97aee4286951 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-4g.dts
@@ -15,7 +15,7 @@
sound {
compatible = "amlogic,axg-sound-card";
- model = "SM1-X96-AIR";
+ model = "X96-AIR";
audio-aux-devs = <&tdmout_b>;
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--
2.17.1

116
projects/Samsung/patches/linux/samsung-0024-HACK-revert-mm-emit-tracepoint-when-RSS-changes.patch
View File

@ -1,116 +0,0 @@
From 38150d5d3558052609824a56b97178eb3b0668c1 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 12 Dec 2019 13:48:45 +0000
Subject: [PATCH 24/25] HACK: revert mm: emit tracepoint when RSS changes
The correct fix is modifying the mali-midgard driver to adapt to the changes
in newer kernels, but until that's done we need to revert this.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
include/linux/mm.h | 14 +++-----------
include/trace/events/kmem.h | 28 ----------------------------
mm/memory.c | 6 ------
3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 465e8ad671f8..474bbd14b065 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1848,27 +1848,19 @@ static inline unsigned long get_mm_counter(struct mm_struct *mm, int member)
return (unsigned long)val;
}
-void mm_trace_rss_stat(struct mm_struct *mm, int member, long count);
-
static inline void add_mm_counter(struct mm_struct *mm, int member, long value)
{
- long count = atomic_long_add_return(value, &mm->rss_stat.count[member]);
-
- mm_trace_rss_stat(mm, member, count);
+ atomic_long_add(value, &mm->rss_stat.count[member]);
}
static inline void inc_mm_counter(struct mm_struct *mm, int member)
{
- long count = atomic_long_inc_return(&mm->rss_stat.count[member]);
-
- mm_trace_rss_stat(mm, member, count);
+ atomic_long_inc(&mm->rss_stat.count[member]);
}
static inline void dec_mm_counter(struct mm_struct *mm, int member)
{
- long count = atomic_long_dec_return(&mm->rss_stat.count[member]);
-
- mm_trace_rss_stat(mm, member, count);
+ atomic_long_dec(&mm->rss_stat.count[member]);
}
/* Optimized variant when page is already known not to be PageAnon */
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index f65b1f6db22d..788e049f899c 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -335,34 +335,6 @@ static unsigned int __maybe_unused mm_ptr_to_hash(const void *ptr)
#define __PTR_TO_HASHVAL
#endif
-TRACE_EVENT(rss_stat,
-
- TP_PROTO(struct mm_struct *mm,
- int member,
- long count),
-
- TP_ARGS(mm, member, count),
-
- TP_STRUCT__entry(
- __field(unsigned int, mm_id)
- __field(unsigned int, curr)
- __field(int, member)
- __field(long, size)
- ),
-
- TP_fast_assign(
- __entry->mm_id = mm_ptr_to_hash(mm);
- __entry->curr = !!(current->mm == mm);
- __entry->member = member;
- __entry->size = (count << PAGE_SHIFT);
- ),
-
- TP_printk("mm_id=%u curr=%d member=%d size=%ldB",
- __entry->mm_id,
- __entry->curr,
- __entry->member,
- __entry->size)
- );
#endif /* _TRACE_KMEM_H */
/* This part must be outside protection */
diff --git a/mm/memory.c b/mm/memory.c
index f703fe8c8346..796c5a62e173 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -72,8 +72,6 @@
#include <linux/oom.h>
#include <linux/numa.h>
-#include <trace/events/kmem.h>
-
#include <asm/io.h>
#include <asm/mmu_context.h>
#include <asm/pgalloc.h>
@@ -154,10 +152,6 @@ static int __init init_zero_pfn(void)
}
core_initcall(init_zero_pfn);
-void mm_trace_rss_stat(struct mm_struct *mm, int member, long count)
-{
- trace_rss_stat(mm, member, count);
-}
#if defined(SPLIT_RSS_COUNTING)
--
2.17.1