archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5212 from chewitt/amlogic-upstream

Browse Source 
amlogic: bump kernel to 5.11.3 and u-boot to 2021.04-rc2
This commit is contained in:
CvH
2021-03-04 23:09:12 +01:00
committed by GitHub
parent fa9da755a1 bd82175d1f
commit d86c890fbe
112 changed files with 870 additions and 6154 deletions
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="6ee1d745b7c9fd573fba142a2efdad76a9f1cb04" # 5.11-rc5
PKG_SHA256="56d3dddbd4d8dcca641683262bfe2dba5049b296abca9f1fc882e156cd206d4e"
PKG_VERSION="e073346387ab794b06409f0708bbc0aa6b99a4fb" # 5.11.3
PKG_SHA256="f60126313507c672d0d8b10064aa07f31d3bb358e1ee28ba1117451c79349f36"
PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;;

6
packages/tools/u-boot/package.mk
View File

@@ -22,6 +22,12 @@ PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/bootloader"
[ -n "${DEVICE}" ] && PKG_NEED_UNPACK+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/bootloader"
case "${PROJECT}" in
Amlogic)
PKG_VERSION="807482107a6d426dbcd6457d9ccf8b3ce6ca887b" # 2021.04-rc2 custodians/u-boot-amlogic-test
PKG_SHA256="a10430d2c1a1d9e83e66bed342433ddfe4f3d6f16d9fa8b4d4c034b600baffd3"
PKG_URL="https://github.com/chewitt/u-boot/archive/${PKG_VERSION}.tar.gz"
PKG_PATCH_DIRS="amlogic"
;;
Rockchip)
PKG_VERSION="8659d08d2b589693d121c1298484e861b7dafc4f"
PKG_SHA256="3f9f2bbd0c28be6d7d6eb909823fee5728da023aca0ce37aef3c8f67d1179ec1"

2
projects/Amlogic/devices/AMLGX/options
View File

@@ -13,7 +13,7 @@
arm)
TARGET_KERNEL_ARCH="arm64"
TARGET_PATCH_ARCH="aarch64"
TARGET_FLOAT=hard
TARGET_FLOAT="hard"
TARGET_CPU="cortex-a53"
TARGET_CPU_FLAGS="+crc"
TARGET_FPU="neon-fp-armv8"

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

@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.11.0-rc5 Kernel Configuration
# Linux/arm64 5.11.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025"
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90201
CONFIG_LD_VERSION=233010000
CONFIG_GCC_VERSION=100201
CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -212,6 +212,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
CONFIG_EMBEDDED=y
@@ -4953,6 +4954,10 @@ CONFIG_LEDS_SYSCON=y
# CONFIG_LEDS_SPI_BYTE is not set
# CONFIG_LEDS_TI_LMU_COMMON is not set
#
# Flash and Torch LED drivers
#
#
# LED Triggers
#
@@ -5901,7 +5906,6 @@ CONFIG_RESET_MESON_AUDIO_ARB=y
CONFIG_GENERIC_PHY=y
CONFIG_GENERIC_PHY_MIPI_DPHY=y
# CONFIG_PHY_XGENE is not set
# CONFIG_USB_LGM_PHY is not set
CONFIG_PHY_MESON8B_USB2=y
CONFIG_PHY_MESON_GXL_USB2=y
CONFIG_PHY_MESON_G12A_USB2=y

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

@@ -1,7 +1,7 @@
From ad278b0b4de9ef9e8ef1b06db91caeafe158df75 Mon Sep 17 00:00:00 2001
From 8cb76f1b0c1d4bf9e314f7039086676397fdd6ae Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
Date: Sat, 13 Apr 2019 05:41:51 +0000
Subject: [PATCH 01/76] HACK: set meson-gx cma pool to 896MB
Subject: [PATCH 01/78] HACK: set meson-gx cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use
@@ -11,10 +11,10 @@ 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..d90a7e376a62 100644
index 0edd137151f8..797e193af8e3 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -47,7 +47,7 @@
@@ -46,7 +46,7 @@
linux,cma {
compatible = "shared-dma-pool";
reusable;

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

@@ -1,7 +1,7 @@
From b915964814b1b467787627dc8e622bf7db63a730 Mon Sep 17 00:00:00 2001
From 177719611a14c837af8d04c772ed218c766d708d Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
Date: Wed, 14 Aug 2019 19:58:14 +0000
Subject: [PATCH 02/76] HACK: set meson-g12 cma pool to 896MB
Subject: [PATCH 02/78] HACK: set meson-g12 cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use
@@ -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..9f79f594c6a7 100644
index b858c5e43cc8..3a4f20506a61 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 @@

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

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

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

@@ -1,7 +1,7 @@
From 00500ea062d07a5340d72063061e0109d488c0d9 Mon Sep 17 00:00:00 2001
From 647a540eba9a95e654f7c11c430cca9aa651bd01 Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Sat, 6 Jul 2019 07:54:44 +0000
Subject: [PATCH 04/76] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
Subject: [PATCH 04/78] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
memory region
Vendor firmware/uboot has an additional reserved region for BL32 trusted
@@ -16,10 +16,10 @@ Signed-off-by: kszaq <kszaquitto@gmail.com>
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index d90a7e376a62..ac6e99a9c95f 100644
index 797e193af8e3..cf9eb7c8a6f0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -44,6 +44,12 @@
@@ -43,6 +43,12 @@
no-map;
};

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

@@ -1,7 +1,7 @@
From d2794dfd488506e16dff8be3bbb8b4274f90f4a6 Mon Sep 17 00:00:00 2001
From d4bd6f62601948e7814cb60b1505f80c4fdbe317 Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Wed, 29 Jul 2020 04:05:03 +0900
Subject: [PATCH 05/76] HACK: drm/meson: add YUV422 output support
Subject: [PATCH 05/78] 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.

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

@@ -1,7 +1,7 @@
From 915da94d239f404300ad4f0039852193a5570eee Mon Sep 17 00:00:00 2001
From eabdf5af33387cd914e396e735cd53ef8fdf7216 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
Subject: [PATCH 06/78] 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

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

@@ -1,37 +0,0 @@
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 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
uint32 type. It's erroneous from the DT schema and driver points of view
to declare it as boolean. As Neil suggested set it to 0x20 so not break
the platform and to make the dtbs checker happy.
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Fixes: 9baf7d6be730 ("arm64: dts: meson: g12a: Add G12A USB nodes")
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
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 9f79f594c6a7..85def57463db 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -2390,7 +2390,7 @@
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host";
snps,dis_u2_susphy_quirk;
- snps,quirk-frame-length-adjustment;
+ snps,quirk-frame-length-adjustment = <0x20>;
snps,parkmode-disable-ss-quirk;
};
};
--
2.17.1

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

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

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

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

4
projects/Amlogic/patches/linux/amlogic-0010-FROMGIT-arm64-dts-meson-vim3-enable-hdmi-audio-loopb.patch → projects/Amlogic/patches/linux/amlogic-0009-FROMGIT-arm64-dts-meson-vim3-enable-hdmi-audio-loopb.patch
View File

@@ -1,7 +1,7 @@
From 23493d56b60796f18114ef6934d391bf22ceb3bb Mon Sep 17 00:00:00 2001
From fdf605998fa39038f483af016c08d2fcca0f27b8 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 4 Dec 2020 16:23:55 +0100
Subject: [PATCH 10/76] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
Subject: [PATCH 09/78] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
loopback
Enable audio capture frontends and a tdm decoder.

4
projects/Amlogic/patches/linux/amlogic-0012-FROMGIT-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-a.patch → projects/Amlogic/patches/linux/amlogic-0010-FROMGIT-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-a.patch
View File

@@ -1,7 +1,7 @@
From 95798563aae9367daf1ac6658b87cb4ff76d2dae Mon Sep 17 00:00:00 2001
From 3a17391487bab3d68738bf9077537a3f8d2c7f47 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 21 Dec 2020 12:06:25 +0000
Subject: [PATCH 12/76] FROMGIT: arm64: dts: meson: add i2c3/rtc nodes and rtc
Subject: [PATCH 10/78] 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

4
projects/Amlogic/patches/linux/amlogic-0013-FROMGIT-arm64-dts-meson-add-initial-Beelink-GS-King-.patch → projects/Amlogic/patches/linux/amlogic-0011-FROMGIT-arm64-dts-meson-add-initial-Beelink-GS-King-.patch
View File

@@ -1,7 +1,7 @@
From 4cbd3774b438c750f637db262531424906aafa3f Mon Sep 17 00:00:00 2001
From 8b54edde0a895a619f8295f1dc5dd7ce01b5aa79 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 12 Jun 2020 08:05:20 +0000
Subject: [PATCH 13/76] FROMGIT: arm64: dts: meson: add initial Beelink
Subject: [PATCH 11/78] 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

37
projects/Amlogic/patches/linux/amlogic-0011-FROMGIT-arm64-dts-meson-switch-TFLASH_VDD_EN-pin-to-.patch
View File

@@ -1,37 +0,0 @@
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 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
middle of loading early stages of the bootloader from SD card.
This can be achieved by using the OPEN_DRAIN flag instead if the
ACTIVE_HIGH, what will leave the pin in input to achieve high state (pin
has the pull-up) and solve the issue.
Suggested-by: Neil Armstrong <narmstrong@baylibre.com>
Fixes: 326e57518b0d ("arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 cf5a98f0e47c..a712273c905a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
@@ -52,7 +52,7 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- gpio = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
enable-active-high;
regulator-always-on;
};
--
2.17.1

4
projects/Amlogic/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-shorten-audio-card-names-for.patch → projects/Amlogic/patches/linux/amlogic-0012-FROMGIT-arm64-dts-meson-shorten-audio-card-names-for.patch
View File

@@ -1,7 +1,7 @@
From fb5e6b0507011d8bd5a06c04905318d38ed0672d Mon Sep 17 00:00:00 2001
From bd15aa7673def445d35620db5b0516d4693c1519 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 31 Dec 2020 15:54:34 +0000
Subject: [PATCH 14/76] FROMGIT: arm64: dts: meson: shorten audio card names
Subject: [PATCH 12/78] FROMGIT: arm64: dts: meson: shorten audio card names
for alsa compatibility
This patch shortens all audio card model names by dropping the SoC prefix

5
projects/Amlogic/patches/linux/amlogic-0038-FROMLIST-v2-arm64-dts-meson-sort-Amlogic-dtb-Makefil.patch → projects/Amlogic/patches/linux/amlogic-0013-FROMGIT-arm64-dts-meson-sort-Amlogic-dtb-Makefile.patch
View File

@@ -1,8 +1,7 @@
From 5c639a0f1b68fd54a88043d83f201359b3c3a79a Mon Sep 17 00:00:00 2001
From 7b6782b8bccfed066c2b55871f0276dd4e2ebc2a 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
Subject: [PATCH 13/78] FROMGIT: arm64: dts: meson: sort Amlogic dtb Makefile
Sort the Makefile before adding new SM1 devices.

6
projects/Amlogic/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-convert-meson-sm1-odroid.patch → projects/Amlogic/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-convert-meson-sm1-odroid-c4-.patch
View File

@@ -1,8 +1,8 @@
From 2daf69b2b9acb20568d4fe3b0dbc92fa3569129a Mon Sep 17 00:00:00 2001
From 5169e50955183bef65a3d2ad8331a7fae342a72b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
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
Subject: [PATCH 14/78] FROMGIT: 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.

Some files were not shown because too many files have changed in this diff Show More