Skip to content

Commit

Permalink
linux: bump Amlogic kenel and patches to Linux 6.8.y
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  • Loading branch information
chewitt committed Mar 25, 2024
1 parent 6bce4b0 commit cfc938c
Show file tree
Hide file tree
Showing 81 changed files with 3,464 additions and 3,188 deletions.
4 changes: 2 additions & 2 deletions packages/linux/package.mk
Expand Up @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"

case "${LINUX}" in
amlogic)
PKG_VERSION="004dcea13dc10acaf1486d9939be4c793834c13c" # 6.7.5
PKG_SHA256="65911f37f072778f60f77821e8c4cf67e7a8aeca8a290fbbb743ee877048a676"
PKG_VERSION="e8f897f4afef0031fe618a8e94127a0934896aba" # 6.8.0
PKG_SHA256="52608771cc42196f0a7a71a93270a27ca5f7ba1d9280fb398e521b0620a7a3ac"
PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
PKG_PATCH_DIRS="default"
Expand Down
@@ -1,7 +1,7 @@
From 7b7853885891650fff72c6133d24d34998b658fb Mon Sep 17 00:00:00 2001
From fa91cacc8756959b9b04b2cd3d369888b9a19e82 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:41:51 +0000
Subject: [PATCH 01/64] LOCAL: set meson-gx cma pool to 896MB
Subject: [PATCH 01/53] LOCAL: set meson-gx cma pool to 896MB

This change sets the CMA pool to a larger 896MB! value for vdec use

Expand Down
@@ -1,7 +1,7 @@
From b06263d189fe8c6afc4b6bfe0bd50823042b39fc Mon Sep 17 00:00:00 2001
From db61fd1f5ac1a4b39f7699ef5583db1464f2a419 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 14 Aug 2019 19:58:14 +0000
Subject: [PATCH 02/64] LOCAL: set meson-g12 cma pool to 896MB
Subject: [PATCH 02/53] LOCAL: set meson-g12 cma pool to 896MB

This change sets the CMA pool to a larger 896MB! value for vdec use

Expand Down
@@ -1,7 +1,7 @@
From cc51fd5a5dc1eedeb89f802f9479d3510817bebe Mon Sep 17 00:00:00 2001
From ee6ecf00c056184730623b0a09f8e1ce0adb3d24 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:45:18 +0000
Subject: [PATCH 03/64] LOCAL: arm64: fix Kodi sysinfo CPU information
Subject: [PATCH 03/53] LOCAL: arm64: fix Kodi sysinfo CPU information

This allows the CPU information to show in the Kodi sysinfo screen, e.g.

Expand All @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index a257da7b56fe..de893e3a5e57 100644
index 47043c0d95ec..03410a9fac77 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -192,8 +192,7 @@ static int c_show(struct seq_file *m, void *v)
@@ -190,8 +190,7 @@ static int c_show(struct seq_file *m, void *v)
* "processor". Give glibc what it expects.
*/
seq_printf(m, "processor\t: %d\n", i);
Expand Down
@@ -1,7 +1,7 @@
From 8686b57a5828a674d07954da9d0993b84202966b Mon Sep 17 00:00:00 2001
From 18375f3ce86dcec9a07f711b696aefb6fcb79829 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:23 +0100
Subject: [PATCH 04/64] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
Subject: [PATCH 04/53] LOCAL: 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.
Expand Down
@@ -1,7 +1,7 @@
From feabed1f718912863b14a051074fc5feb7e6e55a Mon Sep 17 00:00:00 2001
From 346f8f56697d21901ca2c5d48c7beecc654131c0 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:25 +0100
Subject: [PATCH 05/64] LOCAL: arm64: dts: meson: add support for GX PM and
Subject: [PATCH 05/53] LOCAL: arm64: dts: meson: add support for GX PM and
Virtual RTC

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Expand Down
@@ -1,7 +1,7 @@
From 3f431bfc58eb527290ad1b461e5e291536a675cf Mon Sep 17 00:00:00 2001
From e288d4c79fb45f1af148b279bcfd091f770e9070 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 21 Jan 2021 01:35:36 +0000
Subject: [PATCH 06/64] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Subject: [PATCH 06/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Khadas VIM

Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
Expand Down
@@ -1,7 +1,7 @@
From 9f5b04acf796cb5c423de664296dfd66b3c98975 Mon Sep 17 00:00:00 2001
From 1ebc6f1a726d896fb8c72ed5e86423ad2485eea1 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 6 Nov 2021 13:01:08 +0000
Subject: [PATCH 07/64] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Subject: [PATCH 07/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Khadas VIM2

Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
Expand Down
@@ -1,7 +1,7 @@
From 9d15c5b5d125d392bbcca8d74f9c76cbbd6157e8 Mon Sep 17 00:00:00 2001
From 83e3e72c22bd9261d248c2dda723d5fb3abd4ab9 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Feb 2021 19:27:40 +0000
Subject: [PATCH 08/64] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
Subject: [PATCH 08/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
NEO U9-H

Add node aliases to prevent meson-vrtc from claiming /dev/rtc0
Expand Down
@@ -1,7 +1,7 @@
From ef1379f8920505d862ae335355afa60ff564554b Mon Sep 17 00:00:00 2001
From b419174ce9cd28aa55673140319aa4317922d0d7 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sun, 17 Apr 2022 04:37:48 +0000
Subject: [PATCH 09/64] LOCAL: ASoC: meson: assign internal PCM
Subject: [PATCH 09/53] LOCAL: ASoC: meson: assign internal PCM
chmap/ELD/IEC958 kctls to device 0

On SoC sound devices utilizing codec2codec DAI links with an HDMI codec the kctls
Expand All @@ -24,10 +24,10 @@ Tested-by: Christian Hewitt <christianshewitt@gmail.com>
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index a11cd7d6295f..94269e485873 100644
index 41103e5c43ce..0db7fe63911e 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -2547,7 +2547,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
@@ -2581,7 +2581,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
knew.name = "Playback Channel Map";
else
knew.name = "Capture Channel Map";
Expand All @@ -40,10 +40,10 @@ index a11cd7d6295f..94269e485873 100644
knew.private_value = private_value;
info->kctl = snd_ctl_new1(&knew, info);
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 0938671700c6..3131a20f1b21 100644
index d3abb7ce2153..e06b28c7e5ba 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -801,7 +801,8 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd,
@@ -802,7 +802,8 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd,
if (!kctl)
return -ENOMEM;

Expand Down
@@ -1,12 +1,12 @@
From 9034557a662a52e608fb504570f6f5fa92bb2b55 Mon Sep 17 00:00:00 2001
From 9787871fe1e00af9f915237be4474a3b1f1e0887 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 5 Jan 2023 15:16:46 +0000
Subject: [PATCH 42/64] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware
Subject: [PATCH 10/53] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware
decoding

The MPEG1/2 decoder is broken and nobody has volunteered to poke
code and fix it. As media is almost never over 1080p resolution
boards should be able to software decode it. So lets just disable
code and fix it. As media is mostly SD (and never over 1080p)
resolution most boards can software decode it. So lets disable
hardware decoding for now.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Expand All @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 110 deletions(-)

diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
index 90543b4b0cd2..083adf0d07d9 100644
index 70c9fd7c8bc5..f1df637681e5 100644
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
@@ -39,28 +39,6 @@ static const struct amvdec_format vdec_formats_gxbb[] = {
@@ -26,28 +26,6 @@ static const struct amvdec_format vdec_formats_gxbb[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
Expand Down Expand Up @@ -47,7 +47,7 @@ index 90543b4b0cd2..083adf0d07d9 100644
},
};

@@ -101,28 +79,6 @@ static const struct amvdec_format vdec_formats_gxl[] = {
@@ -76,28 +54,6 @@ static const struct amvdec_format vdec_formats_gxl[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
Expand Down Expand Up @@ -76,7 +76,7 @@ index 90543b4b0cd2..083adf0d07d9 100644
},
};

@@ -163,28 +119,6 @@ static const struct amvdec_format vdec_formats_gxm[] = {
@@ -126,28 +82,6 @@ static const struct amvdec_format vdec_formats_gxm[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
Expand Down Expand Up @@ -105,7 +105,7 @@ index 90543b4b0cd2..083adf0d07d9 100644
},
};

@@ -213,28 +147,6 @@ static const struct amvdec_format vdec_formats_g12a[] = {
@@ -176,28 +110,6 @@ static const struct amvdec_format vdec_formats_g12a[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
Expand Down Expand Up @@ -134,7 +134,7 @@ index 90543b4b0cd2..083adf0d07d9 100644
},
};

@@ -263,28 +175,6 @@ static const struct amvdec_format vdec_formats_sm1[] = {
@@ -226,28 +138,6 @@ static const struct amvdec_format vdec_formats_sm1[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
Expand Down
@@ -1,8 +1,8 @@
From 2e3a661a580292de22a1d73b6e8987dde8a03bb2 Mon Sep 17 00:00:00 2001
From f376bb7ba1afbca87fba7b98f31697cba6776b1b Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Mon, 16 Oct 2023 10:02:03 +0200
Subject: [PATCH 22/64] FROMLIST(v1): arm64: dts: VIM3: Set the rates of the
clocks for the NPU
Subject: [PATCH 11/53] FROMGIT(6.9): arm64: dts: meson-g12-common: Set the
rates of the clocks for the NPU

Otherwise they are left at 24MHz and the NPU runs very slowly.

Expand Down

0 comments on commit cfc938c

Please sign in to comment.