qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rewrite kernel patches

This commit is contained in:
SteeManMI 2024-07-29 09:58:41 -04:00 committed by Igor
parent 78acfe1a5a
commit dcf916ffe8
53 changed files with 312 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patch/kernel/archive/meson-6.10/0007-dt-bindings-phy-meson8b-usb2-Add-support-for-reading.patch
View File

@ -1,8 +1,7 @@
From 85409ae3c08b4b1aedc80d35f0afd6832cfe5d1f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 16 Jun 2021 20:34:01 +0200
Subject: [PATCH 07/96] dt-bindings: phy: meson8b-usb2: Add support for reading
the ID signal
Subject: dt-bindings: phy: meson8b-usb2: Add support for reading the ID signal
The first USB PHY on Amlogic Meson8/8b/8m2/GXBB SoCs is OTG capable.
This means that the USB "ID" signal is routed to the PHY. Add support
@ -12,11 +11,11 @@ an "gpio-usb-b-connector".
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../bindings/phy/amlogic,meson8b-usb2-phy.yaml | 9 +++++++++
Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml
index df68bfe5f..be722a235 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml
@@ -6,6 +6,10 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
@ -43,5 +42,5 @@ index df68bfe5f..be722a235 100644
minItems: 1
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0008-phy-amlogic-meson8b-usb2-Add-support-for-reading-the.patch
View File

@ -1,8 +1,7 @@
From fa852523a5da72615695668ef4d354b6af2cae83 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 3 May 2020 21:40:27 +0200
Subject: [PATCH 08/96] phy: amlogic: meson8b-usb2: Add support for reading the
"ID" signal
Subject: phy: amlogic: meson8b-usb2: Add support for reading the "ID" signal
The first USB PHY on Amlogic Meson8/8b/8m2/GXBB SoCs is OTG capable.
This means that the USB "ID" signal is routed to the PHY. Add support
@ -16,11 +15,11 @@ wired in hardware inside the SoC silicon or not wired on the boards
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/phy/amlogic/phy-meson8b-usb2.c | 42 +++++++++++++++++++++++++-
drivers/phy/amlogic/phy-meson8b-usb2.c | 42 +++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c
index d63147c41..d3d0bd367 100644
index 111111111111..222222222222 100644
--- a/drivers/phy/amlogic/phy-meson8b-usb2.c
+++ b/drivers/phy/amlogic/phy-meson8b-usb2.c
@@ -7,6 +7,7 @@
@ -99,5 +98,5 @@ index d63147c41..d3d0bd367 100644
if (IS_ERR(phy)) {
return dev_err_probe(&pdev->dev, PTR_ERR(phy),
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0009-usb-common-usb-conn-gpio-Fall-back-to-polling-the-GP.patch
View File

@ -1,8 +1,7 @@
From 8d8783f1098d154b6beb13fb694cf932dbf43e43 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 16 Jun 2021 21:07:50 +0200
Subject: [PATCH 09/96] usb: common: usb-conn-gpio: Fall back to polling the
GPIO
Subject: usb: common: usb-conn-gpio: Fall back to polling the GPIO
On some SoCs (for example: Amlogic Meson8/8b/8m2 and GXBB) the ID GPIO
cannot generate an interrupt. Fall back to polling the GPIO(s) in that
@ -10,11 +9,11 @@ case.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/usb/common/usb-conn-gpio.c | 76 +++++++++++++++++++-----------
drivers/usb/common/usb-conn-gpio.c | 76 ++++++----
1 file changed, 48 insertions(+), 28 deletions(-)
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
index 501e8bc97..b0b19e026 100644
index 111111111111..222222222222 100644
--- a/drivers/usb/common/usb-conn-gpio.c
+++ b/drivers/usb/common/usb-conn-gpio.c
@@ -23,6 +23,7 @@
@ -143,5 +142,5 @@ index 501e8bc97..b0b19e026 100644
return 0;
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0010-usb-dwc2-register-child-USB-connector-devices.patch
View File

@ -1,7 +1,7 @@
From d7166eaf19e263a1b6dd551f1b5c40b86524b4d6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 4 Jul 2020 21:04:29 +0200
Subject: [PATCH 10/96] usb: dwc2: register child (USB connector) devices
Subject: usb: dwc2: register child (USB connector) devices
Populate the child devices/nodes of the dwc2 controller. Typically these
are USB connectors with a compatible string (and additional properties)
@ -9,11 +9,11 @@ like "gpio-usb-b-connector".
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/usb/dwc2/platform.c | 14 ++++++++++++++
drivers/usb/dwc2/platform.c | 14 ++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index b1d48019e..d56c1ea5b 100644
index 111111111111..222222222222 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -12,6 +12,7 @@
@ -45,5 +45,5 @@ index b1d48019e..d56c1ea5b 100644
#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0011-ARM-dts-meson-Add-GPIO-controller-capabilities-to-th.patch
View File

@ -1,8 +1,8 @@
From 8a559e2ff9aa875656c3c62df16dedc84f68c2b7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 16 Jun 2021 20:38:07 +0200
Subject: [PATCH 11/96] ARM: dts: meson: Add GPIO controller capabilities to
the first USB PHY
Subject: ARM: dts: meson: Add GPIO controller capabilities to the first USB
PHY
This is needed for boards that implement OTG functionality to read out
the value of the "ID" signal (e.g. on Micro USB connectors).
@ -13,7 +13,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
index 8cb0fc78b..0e7756c95 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson.dtsi
@@ -124,6 +124,8 @@ usb0_phy: phy@8800 {
@ -26,5 +26,5 @@ index 8cb0fc78b..0e7756c95 100644
};
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0012-ARM-dts-meson8b-odroidc1-Enable-the-Micro-USB-OTG-co.patch
View File

@ -1,8 +1,7 @@
From ebc6d5206b98d516e34304a42898d7733301cc96 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 4 May 2020 00:16:00 +0200
Subject: [PATCH 12/96] ARM: dts: meson8b: odroidc1: Enable the Micro USB OTG
connector
Subject: ARM: dts: meson8b: odroidc1: Enable the Micro USB OTG connector
Enable &usb0 which is routed to the Micro USB connector. The port
supports OTG modes and the role switch is implemented by reading out the
@ -10,11 +9,11 @@ supports OTG modes and the role switch is implemented by reading out the
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../arm/boot/dts/amlogic/meson8b-odroidc1.dts | 34 ++++++++++++++++++-
arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 34 +++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
index 941682844..eaf89638c 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
@@ -93,6 +93,20 @@ rtc32k_xtal: rtc32k-xtal-clk {
@ -71,5 +70,5 @@ index 941682844..eaf89638c 100644
+ status = "okay";
+};
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0013-dt-bindings-phy-Add-bindings-for-the-Amlogic-Meson-C.patch
View File

@ -1,21 +1,19 @@
From 84f7776a36cf1b7bae65498c93dd7850efa0c12b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 11 Oct 2021 23:37:19 +0200
Subject: [PATCH 13/96] dt-bindings: phy: Add bindings for the Amlogic Meson
CVBS DAC
Subject: dt-bindings: phy: Add bindings for the Amlogic Meson CVBS DAC
Amlogic Meson SoCs embed a Composite Video Baseband Signal DAC. Add the
bindings for this IP.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../phy/amlogic,meson-cvbs-dac-phy.yaml | 82 +++++++++++++++++++
Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml | 82 ++++++++++
1 file changed, 82 insertions(+)
create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml
new file mode 100644
index 000000000..906a69505
index 000000000000..111111111111
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml
@@ -0,0 +1,82 @@
@ -102,5 +100,5 @@ index 000000000..906a69505
+ clocks = <&vdac_clock>;
+ };
--
2.45.1
Armbian

16
patch/kernel/archive/meson-6.10/0014-phy-amlogic-Add-a-new-driver-for-the-CVBS-DAC-CVBS-P.patch
View File

@ -1,8 +1,7 @@
From a8af3998b655e87d5a10380584d2e80a93129195 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 11 Oct 2021 23:05:25 +0200
Subject: [PATCH 14/96] phy: amlogic: Add a new driver for the CVBS DAC (CVBS
PHY)
Subject: phy: amlogic: Add a new driver for the CVBS DAC (CVBS PHY)
Amlogic Meson SoCs embed a CVBS DAC which converts the signal from the
VPU to analog. The IP has evolved over time with the SoC generations:
@ -23,12 +22,11 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/phy/amlogic/Kconfig | 10 +
drivers/phy/amlogic/Makefile | 1 +
drivers/phy/amlogic/phy-meson-cvbs-dac.c | 376 +++++++++++++++++++++++
drivers/phy/amlogic/phy-meson-cvbs-dac.c | 376 ++++++++++
3 files changed, 387 insertions(+)
create mode 100644 drivers/phy/amlogic/phy-meson-cvbs-dac.c
diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig
index ce7ba3eb2..671435b60 100644
index 111111111111..222222222222 100644
--- a/drivers/phy/amlogic/Kconfig
+++ b/drivers/phy/amlogic/Kconfig
@@ -25,6 +25,16 @@ config PHY_MESON8B_USB2
@ -49,7 +47,7 @@ index ce7ba3eb2..671435b60 100644
tristate "Meson GXL and GXM USB2 PHY drivers"
default ARCH_MESON
diff --git a/drivers/phy/amlogic/Makefile b/drivers/phy/amlogic/Makefile
index 91e3b9790..f6c38f738 100644
index 111111111111..222222222222 100644
--- a/drivers/phy/amlogic/Makefile
+++ b/drivers/phy/amlogic/Makefile
@@ -1,6 +1,7 @@
@ -62,7 +60,7 @@ index 91e3b9790..f6c38f738 100644
obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o
diff --git a/drivers/phy/amlogic/phy-meson-cvbs-dac.c b/drivers/phy/amlogic/phy-meson-cvbs-dac.c
new file mode 100644
index 000000000..10edfb120
index 000000000000..111111111111
--- /dev/null
+++ b/drivers/phy/amlogic/phy-meson-cvbs-dac.c
@@ -0,0 +1,376 @@
@ -443,5 +441,5 @@ index 000000000..10edfb120
+MODULE_DESCRIPTION("Amlogic Meson CVBS DAC driver");
+MODULE_LICENSE("GPL v2");
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0015-dt-bindings-display-meson-vpu-Add-the-CVBS-DAC-prope.patch
View File

@ -1,8 +1,7 @@
From 3b2d4e35f9726027f7fe3c0c10dae8e86169ba39 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 20 Oct 2021 22:19:25 +0200
Subject: [PATCH 15/96] dt-bindings: display: meson-vpu: Add the CVBS DAC
properties
Subject: dt-bindings: display: meson-vpu: Add the CVBS DAC properties
The CVBS DAC converts the digital video signal to the (analog) composite
video baseband signal (CVBS). This DAC is part of the HHI registers.
@ -11,11 +10,11 @@ VPU (which outputs the digital signal) and the CVBS DAC.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../bindings/display/amlogic,meson-vpu.yaml | 12 ++++++++++++
Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 12 ++++++++++
1 file changed, 12 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
index cb0a90f02..c9ab01434 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
@@ -82,6 +82,15 @@ properties:
@ -45,5 +44,5 @@ index cb0a90f02..c9ab01434 100644
port@0 {
reg = <0>;
--
2.45.1
Armbian

18
patch/kernel/archive/meson-6.10/0016-drm-meson-Add-support-for-using-a-PHY-for-the-CVBS-D.patch
View File

@ -1,7 +1,7 @@
From 8f9b70c8b353b2140e78d5aba6141b313d603e12 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:06:53 +0200
Subject: [PATCH 16/96] drm/meson: Add support for using a PHY for the CVBS DAC
Subject: drm/meson: Add support for using a PHY for the CVBS DAC
Currently the VPU driver hardcodes the initialization, power-on and
power-off sequences for the CVBS DAC. The registers for the CVBS DAC are
@ -17,12 +17,12 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/Kconfig | 1 +
drivers/gpu/drm/meson/meson_drv.h | 6 +
drivers/gpu/drm/meson/meson_encoder_cvbs.c | 132 ++++++++++++++++-----
drivers/gpu/drm/meson/meson_venc.c | 13 --
drivers/gpu/drm/meson/meson_encoder_cvbs.c | 132 ++++++++--
drivers/gpu/drm/meson/meson_venc.c | 13 -
4 files changed, 110 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
index 615fdd0ce..47e920105 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/Kconfig
+++ b/drivers/gpu/drm/meson/Kconfig
@@ -10,6 +10,7 @@ config DRM_MESON
@ -34,7 +34,7 @@ index 615fdd0ce..47e920105 100644
config DRM_MESON_DW_HDMI
tristate "HDMI Synopsys Controller support for Amlogic Meson Display"
diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
index 3f9345c14..69be4c67f 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -16,6 +16,8 @@ struct drm_device;
@ -58,7 +58,7 @@ index 3f9345c14..69be4c67f 100644
struct {
bool osd1_enabled;
diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
index d1191de85..f849e0f85 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
@@ -11,6 +11,8 @@
@ -282,7 +282,7 @@ index d1191de85..f849e0f85 100644
+ platform_device_unregister(priv->cvbs_dac_pdev);
}
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 3bf0d6e4f..5efd7a298 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -62,10 +62,6 @@
@ -313,5 +313,5 @@ index 3bf0d6e4f..5efd7a298 100644
writel_relaxed(0xff, priv->io_base + _REG(VENC_VDAC_SETTING));
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0018-dt-bindings-clock-meson8b-Add-the-RMII-reference-clo.patch
View File

@ -1,8 +1,7 @@
From 182a6e3ae155fe2a0d9f4380c8f46b531d8e867b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 May 2020 23:16:07 +0200
Subject: [PATCH 18/96] dt-bindings: clock: meson8b: Add the RMII reference
clock input
Subject: dt-bindings: clock: meson8b: Add the RMII reference clock input
Amlogic Meson8 SoCs need an external 50MHz RMII reference clock. This is
either provided by the Ethernet PHY or an external oscillator. Add the
@ -10,11 +9,11 @@ documentation for this clock input.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../devicetree/bindings/clock/amlogic,meson8b-clkc.txt | 2 ++
Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
index cc51e4746..a2602b5d5 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
+++ b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
@@ -16,6 +16,8 @@ Required Properties:
@ -27,5 +26,5 @@ index cc51e4746..a2602b5d5 100644
Parent node should have the following properties :
- compatible: "amlogic,meson-hhi-sysctrl", "simple-mfd", "syscon"
--
2.45.1
Armbian

9
patch/kernel/archive/meson-6.10/0019-dt-bindings-clock-meson8b-Add-the-Meson8-Ethernet-RM.patch
View File

@ -1,8 +1,7 @@
From 2b1a5a4937e6de3aeba31fdd96946ff66d3c1608 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 May 2020 23:23:49 +0200
Subject: [PATCH 19/96] dt-bindings: clock: meson8b: Add the Meson8 Ethernet
(RMII) clocks
Subject: dt-bindings: clock: meson8b: Add the Meson8 Ethernet (RMII) clocks
Export CLKID_ETH_CLK (and it's parents) because it is used as input for
the Ethernet controller on Meson8 SoCs.
@ -13,7 +12,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 4 insertions(+)
diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h
index 385bf243c..a09b686af 100644
index 111111111111..222222222222 100644
--- a/include/dt-bindings/clock/meson8b-clkc.h
+++ b/include/dt-bindings/clock/meson8b-clkc.h
@@ -221,5 +221,9 @@
@ -27,5 +26,5 @@ index 385bf243c..a09b686af 100644
#endif /* __MESON8B_CLKC_H */
--
2.45.1
Armbian

22
patch/kernel/archive/meson-6.10/0020-clk-meson-meson8b-Add-the-Ethernet-RMII-clock-tree-o.patch
View File

@ -1,17 +1,13 @@
From 1336f3b73beada616ef72126e736598e4503fbe0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 May 2020 23:25:13 +0200
Subject: [PATCH 20/96] clk: meson: meson8b: Add the Ethernet (RMII) clock tree
on Meson8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: clk: meson: meson8b: Add the Ethernet (RMII) clock tree on Meson8
Add the Ethernet clock tree on Meson8 which consists of:
- an input mux - the only known input is the RMII reference clock signal
which is an input on one of the SoC's pads
- a divider
- 0° or 180° phase change
- 0deg or 180deg phase change
- a gate to enable/disable the clock
Add these clocks only for Meson8 because they're only known to be used
@ -20,15 +16,15 @@ there.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/clk/meson/Kconfig | 1 +
drivers/clk/meson/meson8b.c | 81 +++++++++++++++++++++++++++++++++++++
drivers/clk/meson/meson8b.c | 81 ++++++++++
drivers/clk/meson/meson8b.h | 1 +
3 files changed, 83 insertions(+)
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
index 29ffd14d2..03e99ee3c 100644
index 111111111111..222222222222 100644
--- a/drivers/clk/meson/Kconfig
+++ b/drivers/clk/meson/Kconfig
@@ -55,6 +55,7 @@ config COMMON_CLK_MESON8B
@@ -59,6 +59,7 @@ config COMMON_CLK_MESON8B
select COMMON_CLK_MESON_REGMAP
select COMMON_CLK_MESON_CLKC_UTILS
select COMMON_CLK_MESON_MPLL
@ -37,7 +33,7 @@ index 29ffd14d2..03e99ee3c 100644
select MFD_SYSCON
select RESET_CONTROLLER
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index b7417ac26..8128e0864 100644
index 111111111111..222222222222 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -19,6 +19,7 @@
@ -150,7 +146,7 @@ index b7417ac26..8128e0864 100644
static const struct meson8b_clk_reset_line {
diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h
index a5b6e67ee..dfec963d4 100644
index 111111111111..222222222222 100644
--- a/drivers/clk/meson/meson8b.h
+++ b/drivers/clk/meson/meson8b.h
@@ -43,6 +43,7 @@
@ -162,5 +158,5 @@ index a5b6e67ee..dfec963d4 100644
#define HHI_VDEC2_CLK_CNTL 0x1e4 /* 0x79 offset in data sheet */
#define HHI_VDEC3_CLK_CNTL 0x1e8 /* 0x7a offset in data sheet */
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0021-dt-bindings-net-dwmac-meson-Add-the-Ethernet-clock-i.patch
View File

@ -1,8 +1,8 @@
From a2f6824d3140baec1ba1b0748b0b3ee08f083185 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 May 2020 23:37:35 +0200
Subject: [PATCH 21/96] dt-bindings: net: dwmac-meson: Add the Ethernet clock
input for Meson6/8
Subject: dt-bindings: net: dwmac-meson: Add the Ethernet clock input for
Meson6/8
The additional DWMAC register on Amlogic Meson6 and Meson8 SoCs take a
clock input (which is provided by the HHI clock controller). For RMII
@ -11,11 +11,11 @@ clock input so the clock can be enabled when needed.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../bindings/net/amlogic,meson-dwmac.yaml | 22 +++++++++++++++++++
Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml | 22 ++++++++++
1 file changed, 22 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
index ee7a65b52..ea4b75ef6 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
@@ -127,6 +127,28 @@ allOf:
@ -48,5 +48,5 @@ index ee7a65b52..ea4b75ef6 100644
compatible:
additionalItems: true
--
2.45.1
Armbian

8
patch/kernel/archive/meson-6.10/0022-net-stmmac-dwmac-meson-Rename-the-SPEED_100-macro.patch
View File

@ -1,7 +1,7 @@
From 237a072d8b71eecddce1f9ec7dda2ae7a46f27bf Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Dec 2021 04:07:05 +0100
Subject: [PATCH 22/96] net: stmmac: dwmac-meson: Rename the SPEED_100 macro
Subject: net: stmmac: dwmac-meson: Rename the SPEED_100 macro
The SPEED_100 macro is part of the PREG_ETHERNET_ADDR0 register. Rename
it accordingly to make this relationship clear.
@ -13,7 +13,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index a16bfa908..919c41e15 100644
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -15,7 +15,8 @@
@ -40,5 +40,5 @@ index a16bfa908..919c41e15 100644
}
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0023-net-stmmac-dwmac-meson-Manage-the-ethernet-clock.patch
View File

@ -1,7 +1,7 @@
From 6cfa3555ebbfd9cfab319352f436ae9d7f0ffdea Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Dec 2021 04:22:53 +0100
Subject: [PATCH 23/96] net: stmmac: dwmac-meson: Manage the "ethernet" clock
Subject: net: stmmac: dwmac-meson: Manage the "ethernet" clock
Meson6 and Meson8 (both use the same glue registers on top of the DWMAC
IP) have a dedicated Ethernet clock. For RMII mode the SoC has an input
@ -17,11 +17,11 @@ registers, based on the Ethernet clock input.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-meson.c | 51 ++++++++++++++++++-
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 51 +++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index 919c41e15..2361734e3 100644
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -5,6 +5,7 @@
@ -113,5 +113,5 @@ index 919c41e15..2361734e3 100644
static const struct of_device_id meson6_dwmac_match[] = {
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0024-net-stmmac-dwmac-meson-Initialize-all-known-PREG_ETH.patch
View File

@ -1,19 +1,19 @@
From 259fca64ab9ea66d43f6bd82584768fb0767789b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Dec 2021 04:18:30 +0100
Subject: [PATCH 24/96] net: stmmac: dwmac-meson: Initialize all known
PREG_ETHERNET_ADDR0 bits
Subject: net: stmmac: dwmac-meson: Initialize all known PREG_ETHERNET_ADDR0
bits
Initialize all known PREG_ETHERNET_ADDR0 register bits to be less
dependent on the bootloader to set them up correctly.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-meson.c | 25 ++++++++++++++++---
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 25 ++++++++--
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index 2361734e3..b96aa4d39 100644
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -5,6 +5,7 @@
@ -72,5 +72,5 @@ index 2361734e3..b96aa4d39 100644
return 0;
}
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0025-ARM-dts-meson-meson8-Add-the-clock-input-to-the-Ethe.patch
View File

@ -1,8 +1,8 @@
From e1e3ba72f71b31abadff7ce2443b3cdeafbdacf1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 May 2020 23:47:47 +0200
Subject: [PATCH 25/96] ARM: dts: meson: meson8: Add the clock input to the
Ethernet controller
Subject: ARM: dts: meson: meson8: Add the clock input to the Ethernet
controller
The Ethernet controller on Meson8 has an additional clock input from the
HHI clock controller. The clock signal provides the RMII reference clock
@ -15,7 +15,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index f57be9ae1..b2be52915 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -613,8 +613,8 @@ temperature_calib: calib@1f4 {
@ -30,5 +30,5 @@ index f57be9ae1..b2be52915 100644
power-domains = <&pwrc PWRC_MESON8_ETHERNET_MEM_ID>;
};
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0026-dt-bindings-clock-meson8b-add-the-rtc_32k-oscillator.patch
View File

@ -1,19 +1,18 @@
From 0361c56921d2f1c27f35bb5ef2165e5550a26d68 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 Jan 2021 19:01:08 +0100
Subject: [PATCH 26/96] dt-bindings: clock: meson8b: add the rtc_32k oscillator
input
Subject: dt-bindings: clock: meson8b: add the rtc_32k oscillator input
The CLK81 tree can be driven off the 32kHz oscillator connected to the
SoCs RTC32K_XI and RTC32K_XO pads. Add this clock as a valid input.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../devicetree/bindings/clock/amlogic,meson8b-clkc.txt | 2 ++
Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
index a2602b5d5..855931509 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
+++ b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
@@ -18,6 +18,8 @@ Required Properties:
@ -26,5 +25,5 @@ index a2602b5d5..855931509 100644
Parent node should have the following properties :
- compatible: "amlogic,meson-hhi-sysctrl", "simple-mfd", "syscon"
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0027-clk-meson-meson8b-Add-the-mpeg_rtc_osc_sel-clock.patch
View File

@ -1,7 +1,7 @@
From 439df3198ef064825150418f9c1244a9f2a20aac Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 1 Jan 2021 18:55:05 +0100
Subject: [PATCH 27/96] clk: meson: meson8b: Add the mpeg_rtc_osc_sel clock
Subject: clk: meson: meson8b: Add the mpeg_rtc_osc_sel clock
The first input of the CLK81 clock tree uses the SoC's external
oscillators. By default it's the 24MHz XTAL from which most frequencies
@ -12,12 +12,12 @@ representation of how the hardware is actually designed.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/clk/meson/meson8b.c | 26 ++++++++++++++++++++++--
drivers/clk/meson/meson8b.c | 26 +++++++++-
include/dt-bindings/clock/meson8b-clkc.h | 1 +
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index 8128e0864..2f7a2adda 100644
index 111111111111..222222222222 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -611,7 +611,24 @@ static struct clk_regmap meson8b_mpll2 = {
@ -93,7 +93,7 @@ index 8128e0864..2f7a2adda 100644
static const struct meson8b_clk_reset_line {
diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h
index a09b686af..fe6c02e04 100644
index 111111111111..222222222222 100644
--- a/include/dt-bindings/clock/meson8b-clkc.h
+++ b/include/dt-bindings/clock/meson8b-clkc.h
@@ -225,5 +225,6 @@
@ -104,5 +104,5 @@ index a09b686af..fe6c02e04 100644
#endif /* __MESON8B_CLKC_H */
--
2.45.1
Armbian

13
patch/kernel/archive/meson-6.10/0028-ARM-dts-meson-Add-address-cells-size-cells-and-range.patch
View File

@ -1,8 +1,7 @@
From b9f75c5b68a79dee3c4ca723a4ee92521118a92d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 28 Aug 2021 18:50:10 +0200
Subject: [PATCH 28/96] ARM: dts: meson: Add #address-cells, #size-cells and
ranges to hhi
Subject: ARM: dts: meson: Add #address-cells, #size-cells and ranges to hhi
The HHI node has multiple child-nodes. Add #address-cells, #size-cells
and ranges properties to the hhi node itself so the child-nodes can get
@ -17,7 +16,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
index 0e7756c95..d7f50fec8 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson.dtsi
@@ -35,6 +35,9 @@ hhi: system-controller@4000 {
@ -31,7 +30,7 @@ index 0e7756c95..d7f50fec8 100644
aiu: audio-controller@5400 {
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index b2be52915..d925bdcc0 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -625,16 +625,18 @@ &gpio_intc {
@ -56,7 +55,7 @@ index b2be52915..d925bdcc0 100644
amlogic,ao-sysctrl = <&pmu>;
clocks = <&clkc CLKID_VPU>;
diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
index 2d9d24d3a..5ffedca99 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -586,16 +586,18 @@ &gpio_intc {
@ -81,5 +80,5 @@ index 2d9d24d3a..5ffedca99 100644
amlogic,ao-sysctrl = <&pmu>;
resets = <&reset RESET_DBLK>,
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0029-dt-bindings-firmware-Document-the-Amlogic-Meson6-8-8.patch
View File

@ -1,8 +1,7 @@
From 5e640e96e1224868456fda4cc2c9e8cca273a79c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 17 May 2021 22:50:25 +0200
Subject: [PATCH 29/96] dt-bindings: firmware: Document the Amlogic
Meson6/8/8b/8m2 TrustZone
Subject: dt-bindings: firmware: Document the Amlogic Meson6/8/8b/8m2 TrustZone
Amlogic Meson6/8/8b/8m2 SoCs can optionally use a TrustZone secure
firmware. This prevents anything outside of the TEE (Trusted
@ -15,13 +14,12 @@ firmware.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../amlogic,meson-mx-trustzone-firmware.yaml | 47 +++++++++++++++++++
Documentation/devicetree/bindings/firmware/meson/amlogic,meson-mx-trustzone-firmware.yaml | 47 ++++++++++
1 file changed, 47 insertions(+)
create mode 100644 Documentation/devicetree/bindings/firmware/meson/amlogic,meson-mx-trustzone-firmware.yaml
diff --git a/Documentation/devicetree/bindings/firmware/meson/amlogic,meson-mx-trustzone-firmware.yaml b/Documentation/devicetree/bindings/firmware/meson/amlogic,meson-mx-trustzone-firmware.yaml
new file mode 100644
index 000000000..1e0e19a35
index 000000000000..111111111111
--- /dev/null
+++ b/Documentation/devicetree/bindings/firmware/meson/amlogic,meson-mx-trustzone-firmware.yaml
@@ -0,0 +1,47 @@
@ -73,5 +71,5 @@ index 000000000..1e0e19a35
+ };
+...
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0030-dt-bindings-arm-cpus-Document-Meson8-TrustZone-firmw.patch
View File

@ -1,8 +1,8 @@
From f753ee1373a56cee5d6c2e7c107a85822828c983 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 18 Dec 2021 16:38:16 +0100
Subject: [PATCH 30/96] dt-bindings: arm: cpus: Document Meson8 TrustZone
firmware enable-method
Subject: dt-bindings: arm: cpus: Document Meson8 TrustZone firmware
enable-method
Amlogic Meson8 SoCs can run a TrustZone firmware. This results in the
CPU registers not being accessible directly and instead require firmware
@ -15,7 +15,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
index cc5a21b47..ec7593e04 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@ -216,6 +216,7 @@ properties:
@ -27,5 +27,5 @@ index cc5a21b47..ec7593e04 100644
- arm,realview-smp
- aspeed,ast2600-smp
--
2.45.1
Armbian

29
patch/kernel/archive/meson-6.10/0031-ARM-meson-Add-support-for-the-TrustZone-firmware.patch
View File

@ -1,7 +1,7 @@
From 5499854ac2d2227951eb9e0437a5897d038cca97 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 3 May 2021 00:34:53 +0200
Subject: [PATCH 31/96] ARM: meson: Add support for the TrustZone firmware
Subject: ARM: meson: Add support for the TrustZone firmware
Amlogic Meson6/8/8b/8m2 SoCs can optionally use a TrustZone secure
firmware. This prevents anything outside of the TEE (Trusted
@ -14,18 +14,15 @@ firmware.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/mach-meson/Makefile | 2 +-
arch/arm/mach-meson/meson.c | 4 +
arch/arm/mach-meson/tz_firmware.c | 250 ++++++++++++++++++
arch/arm/mach-meson/tz_firmware.h | 76 ++++++
.../linux/firmware/meson/meson_mx_trustzone.h | 37 +++
arch/arm/mach-meson/Makefile | 2 +-
arch/arm/mach-meson/meson.c | 4 +
arch/arm/mach-meson/tz_firmware.c | 250 ++++++++++
arch/arm/mach-meson/tz_firmware.h | 76 +++
include/linux/firmware/meson/meson_mx_trustzone.h | 37 ++
5 files changed, 368 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/mach-meson/tz_firmware.c
create mode 100644 arch/arm/mach-meson/tz_firmware.h
create mode 100644 include/linux/firmware/meson/meson_mx_trustzone.h
diff --git a/arch/arm/mach-meson/Makefile b/arch/arm/mach-meson/Makefile
index 49cfbaee4..b8fe5f140 100644
index 111111111111..222222222222 100644
--- a/arch/arm/mach-meson/Makefile
+++ b/arch/arm/mach-meson/Makefile
@@ -1,3 +1,3 @@
@ -34,7 +31,7 @@ index 49cfbaee4..b8fe5f140 100644
+obj-$(CONFIG_ARCH_MESON) += meson.o tz_firmware.o
obj-$(CONFIG_SMP) += platsmp.o
diff --git a/arch/arm/mach-meson/meson.c b/arch/arm/mach-meson/meson.c
index d3ae89dd8..45dae29a4 100644
index 111111111111..222222222222 100644
--- a/arch/arm/mach-meson/meson.c
+++ b/arch/arm/mach-meson/meson.c
@@ -5,6 +5,8 @@
@ -55,7 +52,7 @@ index d3ae89dd8..45dae29a4 100644
MACHINE_END
diff --git a/arch/arm/mach-meson/tz_firmware.c b/arch/arm/mach-meson/tz_firmware.c
new file mode 100644
index 000000000..9cdad4144
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm/mach-meson/tz_firmware.c
@@ -0,0 +1,250 @@
@ -311,7 +308,7 @@ index 000000000..9cdad4144
+EXPORT_SYMBOL_GPL(meson_mx_trustzone_read_soc_rev1);
diff --git a/arch/arm/mach-meson/tz_firmware.h b/arch/arm/mach-meson/tz_firmware.h
new file mode 100644
index 000000000..a9da3c84a
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm/mach-meson/tz_firmware.h
@@ -0,0 +1,76 @@
@ -393,7 +390,7 @@ index 000000000..a9da3c84a
+void __init meson_mx_trustzone_firmware_reserve_mem(void);
diff --git a/include/linux/firmware/meson/meson_mx_trustzone.h b/include/linux/firmware/meson/meson_mx_trustzone.h
new file mode 100644
index 000000000..947463050
index 000000000000..111111111111
--- /dev/null
+++ b/include/linux/firmware/meson/meson_mx_trustzone.h
@@ -0,0 +1,37 @@
@ -435,5 +432,5 @@ index 000000000..947463050
+
+#endif
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0032-ARM-meson-platsmp-Add-support-for-SoCs-running-on-Tr.patch
View File

@ -1,8 +1,8 @@
From 342867fae2835ccac6edc355c6d115f9e69a4eeb Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 3 May 2021 08:36:16 +0200
Subject: [PATCH 32/96] ARM: meson: platsmp: Add support for SoCs running on
TrustZone firmware
Subject: ARM: meson: platsmp: Add support for SoCs running on TrustZone
firmware
When the SoC is running on the TrustZone firmware we cannot modify the
SMP related registers. Add a new set of SMP ops which use firmware calls
@ -10,11 +10,11 @@ to set the startup (function) address and core control (on/off).
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/mach-meson/platsmp.c | 33 +++++++++++++++++++++++++++++++++
arch/arm/mach-meson/platsmp.c | 33 ++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm/mach-meson/platsmp.c b/arch/arm/mach-meson/platsmp.c
index 32ac60b89..3e38066fc 100644
index 111111111111..222222222222 100644
--- a/arch/arm/mach-meson/platsmp.c
+++ b/arch/arm/mach-meson/platsmp.c
@@ -16,6 +16,7 @@
@ -71,5 +71,5 @@ index 32ac60b89..3e38066fc 100644
+ "amlogic,meson8-trustzone-firmware-smp",
+ &meson8_smp_trustzone_firmware_ops);
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0033-soc-amlogic-meson-mx-socinfo-Add-support-for-the-Tru.patch
View File

@ -1,8 +1,8 @@
From 77011250fbd490a4b85363f62e7c4e639191a4ec Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 16 May 2021 19:48:54 +0200
Subject: [PATCH 33/96] soc: amlogic: meson-mx-socinfo: Add support for the
TrustZone firmware
Subject: soc: amlogic: meson-mx-socinfo: Add support for the TrustZone
firmware
When the TrustZone firmware is enabled the SoC is configured so the boot
ROM cannot be read from the (untrusted) Linux kernel. Instead a firmware
@ -12,11 +12,11 @@ the TrustZone firmware is loaded.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/soc/amlogic/meson-mx-socinfo.c | 23 +++++++++++++++--------
drivers/soc/amlogic/meson-mx-socinfo.c | 23 ++++++----
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/soc/amlogic/meson-mx-socinfo.c b/drivers/soc/amlogic/meson-mx-socinfo.c
index 92125dd65..25503bdd7 100644
index 111111111111..222222222222 100644
--- a/drivers/soc/amlogic/meson-mx-socinfo.c
+++ b/drivers/soc/amlogic/meson-mx-socinfo.c
@@ -4,6 +4,7 @@
@ -64,5 +64,5 @@ index 92125dd65..25503bdd7 100644
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
if (!soc_dev_attr)
--
2.45.1
Armbian

14
patch/kernel/archive/meson-6.10/0034-nvmem-meson-mx-efuse-Add-support-for-the-TrustZone-f.patch
View File

@ -1,8 +1,8 @@
From a6e38e2f0cc7be7d75ed8b9895e7bc7af99d0fe0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 3 May 2021 00:35:22 +0200
Subject: [PATCH 34/96] nvmem: meson-mx-efuse: Add support for the TrustZone
firmware interface
Subject: nvmem: meson-mx-efuse: Add support for the TrustZone firmware
interface
Some boards have a TrustZone firmware which prevents us from accessing
(most of) the eFuse registers. On these boards we must use read the
@ -11,11 +11,11 @@ Implement a .reg_read op using the Meson TrustZone firmware interface.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/nvmem/meson-mx-efuse.c | 29 ++++++++++++++++++++++++++++-
drivers/nvmem/meson-mx-efuse.c | 29 +++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index 3ff04d5ca..1a08f5541 100644
index 111111111111..222222222222 100644
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -9,6 +9,7 @@
@ -26,7 +26,7 @@ index 3ff04d5ca..1a08f5541 100644
#include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/module.h>
@@ -166,6 +167,28 @@ static int meson_mx_efuse_read(void *context, unsigned int offset,
@@ -165,6 +166,28 @@ static int meson_mx_efuse_read(void *context, unsigned int offset,
return err;
}
@ -69,5 +69,5 @@ index 3ff04d5ca..1a08f5541 100644
efuse->core_clk = devm_clk_get(&pdev->dev, "core");
if (IS_ERR(efuse->core_clk)) {
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0036-ARM-dts-meson8-Add-the-PWM_C-DV9-and-PWM_D-pins.patch
View File

@ -1,7 +1,7 @@
From 77298a6b2e7937abfefb0514469b03c223cb6414 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Thu, 22 Jul 2021 08:27:29 +0200
Subject: [PATCH 36/96] ARM: dts: meson8: Add the PWM_C (DV9) and PWM_D pins
Subject: ARM: dts: meson8: Add the PWM_C (DV9) and PWM_D pins
There are some Meson8m2 boards which don't use a PMIC (like Ricoh
RN5T618) but use two PWM regulators for VCCK and VDDEE. Add the PWM_C
@ -10,11 +10,11 @@ boards.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson8.dtsi | 16 ++++++++++++++++
arch/arm/boot/dts/amlogic/meson8.dtsi | 16 ++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index d925bdcc0..454c35530 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -479,6 +479,22 @@ gpio: banks@80b0 {
@ -41,5 +41,5 @@ index d925bdcc0..454c35530 100644
mux {
groups = "sd_d0_a", "sd_d1_a", "sd_d2_a",
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0045-dt-bindings-display-meson-vpu-add-support-for-Meson8.patch
View File

@ -1,18 +1,17 @@
From 875ed8762a46e7f0fd143b58a3002c3a76b805cd Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:16:15 +0200
Subject: [PATCH 45/96] dt-bindings: display: meson-vpu: add support for
Meson8/8b/8m2 - WiP
Subject: dt-bindings: display: meson-vpu: add support for Meson8/8b/8m2 - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../devicetree/bindings/display/amlogic,meson-vpu.yaml | 4 ++++
Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
index c9ab01434..96c32747e 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
@@ -66,8 +66,12 @@ properties:
@ -29,5 +28,5 @@ index c9ab01434..96c32747e 100644
reg-names:
--
2.45.1
Armbian

12
patch/kernel/archive/meson-6.10/0046-drm-meson-add-Meson8-Meson8b-Meson8m2-specific-vpu_c.patch
View File

@ -1,19 +1,19 @@
From f4fdd1b75e3ad64c9903a42aeeb9e45a1ad10780 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 21:50:45 +0200
Subject: [PATCH 46/96] drm/meson: add Meson8/Meson8b/Meson8m2 specific
vpu_compatible entries
Subject: drm/meson: add Meson8/Meson8b/Meson8m2 specific vpu_compatible
entries
Add values for Meson8/Meson8b/Meson8m2 to enum vpu_compatible so quirks
for these earlier hardware generations can be added to the driver.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.h | 11 +++++++----
drivers/gpu/drm/meson/meson_drv.h | 11 ++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
index 69be4c67f..8e1c01242 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -20,10 +20,13 @@ struct phy;
@ -35,5 +35,5 @@ index 69be4c67f..8e1c01242 100644
enum {
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0047-drm-meson-Use-24-bits-per-pixel-for-the-framebuffer-.patch
View File

@ -1,8 +1,7 @@
From 31af191867e9272d80820cc452e3c209a24713fa Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 26 Apr 2020 00:00:09 +0200
Subject: [PATCH 47/96] drm/meson: Use 24 bits per pixel for the framebuffer on
Meson8/8b/8m2
Subject: drm/meson: Use 24 bits per pixel for the framebuffer on Meson8/8b/8m2
All SoC generations before GXBB don't have a way to configure the
alpha value for DRM_FORMAT_XRGB8888 and DRM_FORMAT_XBGR8888. These
@ -15,11 +14,11 @@ working framebuffer console.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 26 +++++++++++++++++++++++++-
drivers/gpu/drm/meson/meson_drv.c | 26 +++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 17a5cca00..60298cf3b 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -159,6 +159,30 @@ static void meson_vpu_init(struct meson_drm *priv)
@ -63,5 +62,5 @@ index 17a5cca00..60298cf3b 100644
return 0;
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0048-drm-meson-Use-a-separate-list-of-supported-formats-f.patch
View File

@ -1,8 +1,7 @@
From fc19ccbb10a7f76c8ad92571f306782c4afebe3c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 21:53:21 +0200
Subject: [PATCH 48/96] drm/meson: Use a separate list of supported formats for
32-bit SoCs
Subject: drm/meson: Use a separate list of supported formats for 32-bit SoCs
The VIU_OSD1_CTRL_STAT2 and VIU_OSD2_CTRL_STAT2 registers on
Meson8/Meson8b/Meson8m2 don't have the following bits:
@ -19,11 +18,11 @@ value).
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_plane.c | 30 ++++++++++++++++++++++++++---
drivers/gpu/drm/meson/meson_plane.c | 30 +++++++++-
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 815dfe304..e71503609 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -471,7 +471,20 @@ static const struct drm_plane_funcs meson_plane_funcs = {
@ -80,5 +79,5 @@ index 815dfe304..e71503609 100644
DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane");
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0049-drm-meson-Skip-VIU_OSD1_CTRL_STAT2-alpha-replace-val.patch
View File

@ -1,7 +1,7 @@
From 4fec04a45ba08241d76deaa2640aad5be1743683 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 31 Jan 2022 23:02:59 +0100
Subject: [PATCH 49/96] drm/meson: Skip VIU_OSD1_CTRL_STAT2 alpha replace value
Subject: drm/meson: Skip VIU_OSD1_CTRL_STAT2 alpha replace value
initialization
The VIU_OSD1_CTRL_STAT2 and VIU_OSD2_CTRL_STAT2 registers on
@ -15,11 +15,11 @@ SoCs.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_viu.c | 18 +++++++++++-------
drivers/gpu/drm/meson/meson_viu.c | 18 ++++++----
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
index cd399b0b7..bdfa342c4 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_viu.c
+++ b/drivers/gpu/drm/meson/meson_viu.c
@@ -448,13 +448,17 @@ void meson_viu_init(struct meson_drm *priv)
@ -48,5 +48,5 @@ index cd399b0b7..bdfa342c4 100644
/* Disable VD1 AFBC */
/* di_mif0_en=0 mif0_to_vpp_en=0 di_mad_en=0 and afbc vd1 set=0*/
--
2.45.1
Armbian

9
patch/kernel/archive/meson-6.10/0050-drm-meson-Enable-the-RGB-to-YUV-converter-on-Meson8-.patch
View File

@ -1,8 +1,7 @@
From a7583cc8a459b072fb3613f204143bcfccd18849 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:00:57 +0200
Subject: [PATCH 50/96] drm/meson: Enable the RGB to YUV converter on
Meson8/Meson8b/Meson8m2
Subject: drm/meson: Enable the RGB to YUV converter on Meson8/Meson8b/Meson8m2
Set VIU_OSD1_BLK0_CFG_W0[7] to 1 to enable RGB to YUV converter, just
like on GXBB.
@ -13,7 +12,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index e71503609..27e395772 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -200,8 +200,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane,
@ -31,5 +30,5 @@ index e71503609..27e395772 100644
if (priv->viu.osd1_afbcd &&
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0051-drm-meson-Update-meson_vpu_init-to-work-with-Meson8-.patch
View File

@ -1,8 +1,7 @@
From 8b09602979c279f579ced2d5234f878e8e9243bb Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:03:27 +0200
Subject: [PATCH 51/96] drm/meson: Update meson_vpu_init to work with
Meson8/Meson8b/Meson8m2
Subject: drm/meson: Update meson_vpu_init to work with Meson8/Meson8b/Meson8m2
Don't modify the VPU_RDARB_MODE_* registers because they only exist on
GXBB and newer SoCs. Initialize the VPU_MEM_PD_REG0 and VPU_MEM_PD_REG1
@ -11,11 +10,11 @@ Meson8/Meson8b/Meson8m2.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 55 ++++++++++++++++++-------------
drivers/gpu/drm/meson/meson_drv.c | 55 ++++++----
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 60298cf3b..ffc5eb588 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -135,28 +135,39 @@ static struct regmap_config meson_regmap_config = {
@ -81,5 +80,5 @@ index 60298cf3b..ffc5eb588 100644
static void meson_fbdev_setup(struct meson_drm *priv)
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0052-drm-meson-Describe-the-HDMI-PHY-frequency-limits-of-.patch
View File

@ -1,8 +1,7 @@
From 7017db5123fbbccca0dde37e7a2f45172d50e56e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 23 Dec 2020 21:18:35 +0100
Subject: [PATCH 52/96] drm/meson: Describe the HDMI PHY frequency limits of
Meson8/8b/8m2
Subject: drm/meson: Describe the HDMI PHY frequency limits of Meson8/8b/8m2
The maximum HDMI PLL frequency used by the vendor kernel is 2.976GHz.
For Meson8 and Meson8b (both "HDMI 1.4 4k" capable) the maximum HDMI PHY
@ -14,11 +13,11 @@ and S805Y).
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 18 +++++++++++++++++-
drivers/gpu/drm/meson/meson_drv.c | 18 +++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index ffc5eb588..bbb8b8b50 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -200,13 +200,29 @@ struct meson_drm_soc_attr {
@ -53,5 +52,5 @@ index ffc5eb588..bbb8b8b50 100644
}
},
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0053-drm-meson-Update-the-HDMI-encoder-for-Meson8-8b-8m2.patch
View File

@ -1,7 +1,7 @@
From e37f5e8c60f9ecad4b2286bec22e2989d267971b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 6 Oct 2021 23:34:04 +0200
Subject: [PATCH 53/96] drm/meson: Update the HDMI encoder for Meson8/8b/8m2
Subject: drm/meson: Update the HDMI encoder for Meson8/8b/8m2
Meson8/8b/8m2 uses VPU_HDMI_OUTPUT_YCBCR for YUV444 while newer SoCs use
VPU_HDMI_OUTPUT_CBYCR. Also the 32-bit SoCs use VPU_HDMI_OUTPUT_CRYCB
@ -17,11 +17,11 @@ RGB to YUV converter is always enabled in meson_plane_atomic_update()
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 66 ++++++++++++++++------
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 66 +++++++---
1 file changed, 49 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
index 0593a1cde..d8aae0952 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
@@ -190,13 +190,13 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,
@ -140,5 +140,5 @@ index 0593a1cde..d8aae0952 100644
input_fmts = kcalloc(*num_input_fmts,
sizeof(*input_fmts),
--
2.45.1
Armbian

8
patch/kernel/archive/meson-6.10/0054-drm-meson-Only-set-ycbcr_420_allowed-on-64-bit-SoCs.patch
View File

@ -1,7 +1,7 @@
From 7ba0841fd85b2f8fd11602ea92fb8887ecd3d81c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Wed, 6 Oct 2021 23:37:44 +0200
Subject: [PATCH 54/96] drm/meson: Only set ycbcr_420_allowed on 64-bit SoCs
Subject: drm/meson: Only set ycbcr_420_allowed on 64-bit SoCs
The 32-bit SoCs don't support YUV420 so we don't enable that
functionality there.
@ -12,7 +12,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
index d8aae0952..4a84d7d99 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
@@ -481,8 +481,11 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv)
@ -30,5 +30,5 @@ index d8aae0952..4a84d7d99 100644
pdev = of_find_device_by_node(remote);
of_node_put(remote);
--
2.45.1
Armbian

14
patch/kernel/archive/meson-6.10/0055-drm-meson-Make-the-HHI-registers-optional-WIP.patch
View File

@ -1,7 +1,7 @@
From 39042addabb9910ec95e916fb619f5af8097f0c8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Thu, 7 Oct 2021 19:09:49 +0200
Subject: [PATCH 55/96] drm/meson: Make the HHI registers optional - WIP
Subject: drm/meson: Make the HHI registers optional - WIP
The HHI area contains the clock controller registers as well as the
registers for the CVBS DAC. Make the HHI registers optional because the
@ -10,12 +10,12 @@ functionality provided by them can be handled by separate drivers
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 35 ++++++++++++++++--------------
drivers/gpu/drm/meson/meson_venc.c | 11 +++++++---
drivers/gpu/drm/meson/meson_drv.c | 35 +++++-----
drivers/gpu/drm/meson/meson_venc.c | 11 ++-
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index bbb8b8b50..104b53861 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -271,24 +271,27 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
@ -63,7 +63,7 @@ index bbb8b8b50..104b53861 100644
priv->canvas = meson_canvas_get(dev);
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 5efd7a298..805751b9e 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -1953,12 +1953,16 @@ void meson_venc_enable_vsync(struct meson_drm *priv)
@ -96,5 +96,5 @@ index 5efd7a298..805751b9e 100644
/* Disable HDMI */
writel_bits_relaxed(VPU_HDMI_ENCI_DATA_TO_HDMI |
--
2.45.1
Armbian

22
patch/kernel/archive/meson-6.10/0056-drm-meson-Add-support-for-the-Meson8-8b-8m2-TranSwit.patch
View File

@ -1,8 +1,8 @@
From 7aabe08f5ea4b120e2451904c8c2f7a497eabefe Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 5 May 2019 02:29:42 +0200
Subject: [PATCH 56/96] drm/meson: Add support for the Meson8/8b/8m2 TranSwitch
HDMI transmitter - WiP
Subject: drm/meson: Add support for the Meson8/8b/8m2 TranSwitch HDMI
transmitter - WiP
WiP
@ -10,14 +10,12 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/Kconfig | 10 +
drivers/gpu/drm/meson/Makefile | 1 +
drivers/gpu/drm/meson/meson_transwitch_hdmi.c | 1537 +++++++++++++++++
drivers/gpu/drm/meson/meson_transwitch_hdmi.h | 536 ++++++
drivers/gpu/drm/meson/meson_transwitch_hdmi.c | 1537 ++++++++++
drivers/gpu/drm/meson/meson_transwitch_hdmi.h | 536 ++++
4 files changed, 2084 insertions(+)
create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.c
create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.h
diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
index 47e920105..73ec1b314 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/Kconfig
+++ b/drivers/gpu/drm/meson/Kconfig
@@ -25,3 +25,13 @@ config DRM_MESON_DW_MIPI_DSI
@ -35,7 +33,7 @@ index 47e920105..73ec1b314 100644
+ select REGMAP_MMIO
+ select SND_SOC_HDMI_CODEC if SND_SOC
diff --git a/drivers/gpu/drm/meson/Makefile b/drivers/gpu/drm/meson/Makefile
index 43071bdbd..c44cb6c52 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/Makefile
+++ b/drivers/gpu/drm/meson/Makefile
@@ -7,3 +7,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o
@ -45,7 +43,7 @@ index 43071bdbd..c44cb6c52 100644
+obj-$(CONFIG_DRM_MESON_TRANSWITCH_HDMI) += meson_transwitch_hdmi.o
diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.c b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c
new file mode 100644
index 000000000..3a07ab763
index 000000000000..111111111111
--- /dev/null
+++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c
@@ -0,0 +1,1537 @@
@ -1588,7 +1586,7 @@ index 000000000..3a07ab763
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.h b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h
new file mode 100644
index 000000000..14929475c
index 000000000000..111111111111
--- /dev/null
+++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h
@@ -0,0 +1,536 @@
@ -2129,5 +2127,5 @@ index 000000000..14929475c
+
+#endif /* __MESON_TRANSWITCH_HDMI_H__ */
--
2.45.1
Armbian

22
patch/kernel/archive/meson-6.10/0057-drm-meson-Meson8-Meson8b-Meson8m2-VCLK-HACK.patch
View File

@ -1,20 +1,20 @@
From f105e98570211cb16a2ffdca32ac2869c92f9353 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:13:51 +0200
Subject: [PATCH 57/96] drm/meson: Meson8/Meson8b/Meson8m2 VCLK - HACK
Subject: drm/meson: Meson8/Meson8b/Meson8m2 VCLK - HACK
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 101 ++++++++++++++++++--
drivers/gpu/drm/meson/meson_drv.h | 32 +++++++
drivers/gpu/drm/meson/meson_vclk.c | 146 +++++++++++++++++++++++++++++
drivers/gpu/drm/meson/meson_venc.c | 24 ++++-
drivers/gpu/drm/meson/meson_drv.c | 101 ++++++-
drivers/gpu/drm/meson/meson_drv.h | 32 ++
drivers/gpu/drm/meson/meson_vclk.c | 146 ++++++++++
drivers/gpu/drm/meson/meson_venc.c | 24 +-
4 files changed, 293 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 104b53861..2fb074e53 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -170,6 +170,35 @@ static void meson_vpu_init(struct meson_drm *priv)
@ -202,7 +202,7 @@ index 104b53861..2fb074e53 100644
meson_venc_init(priv);
meson_vpp_init(priv);
diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
index 8e1c01242..59f80fcc6 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -7,9 +7,11 @@
@ -262,7 +262,7 @@ index 8e1c01242..59f80fcc6 100644
struct {
bool osd1_enabled;
diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
index 2a82119eb..a2c1bf1ae 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_vclk.c
+++ b/drivers/gpu/drm/meson/meson_vclk.c
@@ -732,6 +732,11 @@ meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned int freq)
@ -440,7 +440,7 @@ index 2a82119eb..a2c1bf1ae 100644
meson_venci_cvbs_clock_config(priv);
return;
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 805751b9e..d834359c1 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -1954,14 +1954,34 @@ void meson_venc_enable_vsync(struct meson_drm *priv)
@ -481,5 +481,5 @@ index 805751b9e..d834359c1 100644
writel_relaxed(0, priv->io_base + _REG(VENC_INTCTRL));
}
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0058-drm-meson-Enable-support-for-Meson8-Meson8b-Meson8m2.patch
View File

@ -1,18 +1,18 @@
From 8717397eb0cad729cc6244019665476aec47dbaf Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 25 Apr 2020 22:14:27 +0200
Subject: [PATCH 58/96] drm/meson: Enable support for Meson8/Meson8b/Meson8m2
Subject: drm/meson: Enable support for Meson8/Meson8b/Meson8m2
Add a compatible string for each of the three SoCs now that all hardware
specific quirks are added to the driver.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 18 ++++++++++++++++++
drivers/gpu/drm/meson/meson_drv.c | 18 ++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 2fb074e53..3a853fa25 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -660,6 +660,18 @@ static void meson_drv_remove(struct platform_device *pdev)
@ -48,5 +48,5 @@ index 2fb074e53..3a853fa25 100644
.data = (void *)&meson_drm_gxbb_data },
{ .compatible = "amlogic,meson-gxl-vpu",
--
2.45.1
Armbian

22
patch/kernel/archive/meson-6.10/0059-ARM-dts-meson-add-the-VPU-WiP.patch
View File

@ -1,20 +1,20 @@
From 997c2fe858ecc56b1d0d2ccd56cce6c571b87d17 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 8 Dec 2018 13:50:48 +0100
Subject: [PATCH 59/96] ARM: dts: meson: add the VPU - WiP
Subject: ARM: dts: meson: add the VPU - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson.dtsi | 10 +++
arch/arm/boot/dts/amlogic/meson8.dtsi | 80 ++++++++++++++++++++++++
arch/arm/boot/dts/amlogic/meson8b.dtsi | 81 +++++++++++++++++++++++++
arch/arm/boot/dts/amlogic/meson8m2.dtsi | 4 ++
arch/arm/boot/dts/amlogic/meson.dtsi | 10 ++
arch/arm/boot/dts/amlogic/meson8.dtsi | 80 +++++++++
arch/arm/boot/dts/amlogic/meson8b.dtsi | 81 ++++++++++
arch/arm/boot/dts/amlogic/meson8m2.dtsi | 4 +
4 files changed, 175 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
index d7f50fec8..d729a06da 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson.dtsi
@@ -38,6 +38,16 @@ hhi: system-controller@4000 {
@ -35,7 +35,7 @@ index d7f50fec8..d729a06da 100644
aiu: audio-controller@5400 {
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index 454c35530..519443e19 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -314,6 +314,71 @@ mali: gpu@c0000 {
@ -140,7 +140,7 @@ index 454c35530..519443e19 100644
&ethmac {
diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
index 5ffedca99..87aa74675 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -276,6 +276,71 @@ mali: gpu@c0000 {
@ -253,7 +253,7 @@ index 5ffedca99..87aa74675 100644
&ethmac {
diff --git a/arch/arm/boot/dts/amlogic/meson8m2.dtsi b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
index 6725dd9fd..fcb2ad976 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8m2.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
@@ -96,6 +96,10 @@ &usb1_phy {
@ -268,5 +268,5 @@ index 6725dd9fd..fcb2ad976 100644
compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt";
};
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0060-ARM-dts-meson8-add-the-HDMI-controller-WiP.patch
View File

@ -1,17 +1,17 @@
From d724d428a4f5d92bf2b5f169f948e698549b4386 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 5 May 2019 02:30:11 +0200
Subject: [PATCH 60/96] ARM: dts: meson8: add the HDMI controller - WiP
Subject: ARM: dts: meson8: add the HDMI controller - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson8.dtsi | 67 ++++++++++++++++++++++++++-
arch/arm/boot/dts/amlogic/meson8.dtsi | 67 +++++++++-
1 file changed, 65 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index 519443e19..f63ac1404 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -315,6 +315,39 @@ mali: gpu@c0000 {
@ -121,5 +121,5 @@ index 519443e19..f63ac1404 100644
&hwrng {
--
2.45.1
Armbian

8
patch/kernel/archive/meson-6.10/0061-ARM-dts-meson8-Add-the-shared-CMA-dma-memory-pool.patch
View File

@ -1,7 +1,7 @@
From 1b8ef484e7a3af4367b771e74c8f72e8326f897f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 4 Jun 2021 21:50:06 +0200
Subject: [PATCH 61/96] ARM: dts: meson8: Add the shared CMA dma memory pool
Subject: ARM: dts: meson8: Add the shared CMA dma memory pool
The 4K HDMI modes needs more CMA memory (than the default 64MiB) to be
reserved at boot-time. Add a shared-dma-pool with increased size so the
@ -13,7 +13,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index f63ac1404..de9845433 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -193,6 +193,14 @@ power-firmware@4f00000 {
@ -32,5 +32,5 @@ index f63ac1404..de9845433 100644
thermal-zones {
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0062-ARM-dts-meson8-add-the-AO-CEC-controller-WiP.patch
View File

@ -1,17 +1,17 @@
From 4d4c55a553ee723670f756737589633fc95894f2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 5 May 2019 11:44:08 +0200
Subject: [PATCH 62/96] ARM: dts: meson8: add the AO CEC controller - WiP
Subject: ARM: dts: meson8: add the AO CEC controller - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson8.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/amlogic/meson8.dtsi | 17 ++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index de9845433..ae1047eca 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -478,6 +478,14 @@ gpio_ao: ao-bank@14 {
@ -46,5 +46,5 @@ index de9845433..ae1047eca 100644
&ao_arc_rproc {
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0063-ARM-dts-meson8b-add-the-HDMI-controller-WiP.patch
View File

@ -1,17 +1,17 @@
From 15091212cb8b362780e0c54ae0e430bfeca46525 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 5 May 2019 02:30:29 +0200
Subject: [PATCH 63/96] ARM: dts: meson8b: add the HDMI controller - WiP
Subject: ARM: dts: meson8b: add the HDMI controller - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson8b.dtsi | 69 ++++++++++++++++++++++++++
arch/arm/boot/dts/amlogic/meson8b.dtsi | 69 ++++++++++
1 file changed, 69 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
index 87aa74675..176b2dc71 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -277,6 +277,39 @@ mali: gpu@c0000 {
@ -116,5 +116,5 @@ index 87aa74675..176b2dc71 100644
&hwrng {
--
2.45.1
Armbian

10
patch/kernel/archive/meson-6.10/0064-ARM-dts-meson8b-add-the-AO-CEC-controller-WiP.patch
View File

@ -1,17 +1,17 @@
From 6b21e706b95e5e0c8c5b9f691f2fc64befdf8d08 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 5 May 2019 11:44:20 +0200
Subject: [PATCH 64/96] ARM: dts: meson8b: add the AO CEC controller - WiP
Subject: ARM: dts: meson8b: add the AO CEC controller - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/amlogic/meson8b.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/amlogic/meson8b.dtsi | 17 ++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
index 176b2dc71..3e5d97e0c 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -435,6 +435,14 @@ gpio_ao: ao-bank@14 {
@ -46,5 +46,5 @@ index 176b2dc71..3e5d97e0c 100644
&ao_arc_rproc {
--
2.45.1
Armbian

11
patch/kernel/archive/meson-6.10/0066-ARM-dts-meson8b-odroid-c1-enable-HDMI-for-the-Odroid.patch
View File

@ -1,18 +1,17 @@
From 9d61f99a90171d451718e0afb254d5733c4b4852 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 20 Mar 2020 15:17:51 +0100
Subject: [PATCH 66/96] ARM: dts: meson8b: odroid-c1: enable HDMI for the
Odroid-C1 - WiP
Subject: ARM: dts: meson8b: odroid-c1: enable HDMI for the Odroid-C1 - WiP
WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
.../arm/boot/dts/amlogic/meson8b-odroidc1.dts | 59 +++++++++++++++++++
arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 59 ++++++++++
1 file changed, 59 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
index eaf89638c..b03273d90 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
@@ -32,6 +32,17 @@ emmc_pwrseq: emmc-pwrseq {
@ -103,5 +102,5 @@ index eaf89638c..b03273d90 100644
status = "okay";
pinctrl-0 = <&ir_recv_pins>;
--
2.45.1
Armbian

19
patch/kernel/archive/meson-6.10/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch
View File

@ -1,19 +1,18 @@
From b2a6218e25682158d6c7d6029505e60577fd4562 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Sat, 18 Nov 2023 01:22:04 +0800
Subject: [PATCH] Revert "mmc: core: Set HS clock speed before sending HS
CMD13"
Subject: Revert "mmc: core: Set HS clock speed before sending HS CMD13"
This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0.
---
drivers/mmc/core/mmc.c | 23 ++++-------------------
drivers/mmc/core/mmc.c | 23 ++--------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 705942ed..8652fa28 100644
index 111111111111..222222222222 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1390,17 +1390,13 @@ static int mmc_select_hs400es(struct mmc_card *card)
@@ -1401,17 +1401,13 @@ static int mmc_select_hs400es(struct mmc_card *card)
goto out_err;
}
@ -33,7 +32,7 @@ index 705942ed..8652fa28 100644
/* Switch card to DDR with strobe bit */
val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE;
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -1458,7 +1454,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
@@ -1469,7 +1465,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
static int mmc_select_hs200(struct mmc_card *card)
{
struct mmc_host *host = card->host;
@ -42,7 +41,7 @@ index 705942ed..8652fa28 100644
int err = -EINVAL;
u8 val;
@@ -1489,17 +1485,8 @@ static int mmc_select_hs200(struct mmc_card *card)
@@ -1500,17 +1496,8 @@ static int mmc_select_hs200(struct mmc_card *card)
false, true, MMC_CMD_RETRIES);
if (err)
goto err;
@ -60,7 +59,7 @@ index 705942ed..8652fa28 100644
/*
* For HS200, CRC errors are not a reliable way to know the
@@ -1512,10 +1499,8 @@ static int mmc_select_hs200(struct mmc_card *card)
@@ -1523,10 +1510,8 @@ static int mmc_select_hs200(struct mmc_card *card)
* mmc_select_timing() assumes timing has not changed if
* it is a switch error.
*/
@ -73,5 +72,5 @@ index 705942ed..8652fa28 100644
err:
if (err) {
--
2.34.1
Armbian

10
patch/kernel/archive/meson-6.10/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch
View File

@ -1,16 +1,16 @@
From 6b1a414f7bb456817cd3cb385e9f5eb9e0d9cbe7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Sat, 18 Nov 2023 01:22:04 +0800
Subject: [PATCH] Revert "pwm: meson: modify and simplify calculation in
Subject: Revert "pwm: meson: modify and simplify calculation in
meson_pwm_get_state"
This reverts commit 6b9352f3f8a1a35faf0efc1ad1807ee303467796.
---
drivers/pwm/pwm-meson.c | 14 ++++++++++++--
drivers/pwm/pwm-meson.c | 14 ++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 5bea5324..a7c9b555 100644
index 111111111111..222222222222 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -322,8 +322,18 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
@ -35,5 +35,5 @@ index 5bea5324..a7c9b555 100644
state->polarity = PWM_POLARITY_NORMAL;
--
2.34.1
Armbian

15
patch/kernel/archive/meson-6.10/onecloud-0001-add-dts.patch
View File

@ -1,17 +1,16 @@
From 5271ca000048ca86ac8f2e81ebcb1e2a0993cd73 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Sat, 1 Apr 2023 13:24:42 +0800
Subject: [PATCH 1/2] ARM: dts: meson8b: Add DTS for Xunlei Onecloud
Subject: ARM: dts: meson8b: Add DTS for Xunlei Onecloud
Signed-off-by: hzy <hzyitc@outlook.com>
---
arch/arm/boot/dts/amlogic/Makefile | 1 +
.../arm/boot/dts/amlogic/meson8b-onecloud.dts | 410 ++++++++++++++++++
arch/arm/boot/dts/amlogic/Makefile | 1 +
arch/arm/boot/dts/amlogic/meson8b-onecloud.dts | 410 ++++++++++
2 files changed, 411 insertions(+)
create mode 100644 arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile
index a8431078..4ef5d491 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/Makefile
+++ b/arch/arm/boot/dts/amlogic/Makefile
@@ -6,4 +6,5 @@ dtb-$(CONFIG_MACH_MESON8) += \
@ -22,7 +21,7 @@ index a8431078..4ef5d491 100644
meson8m2-mxiii-plus.dtb
diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
new file mode 100644
index 00000000..1fa5420f
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
@@ -0,0 +1,410 @@
@ -437,5 +436,5 @@ index 00000000..1fa5420f
+ pinctrl-names = "default";
+};
--
2.34.1
Armbian

10
patch/kernel/archive/meson-6.10/onecloud-0002-dts-Support-HDMI.patch
View File

@ -1,15 +1,15 @@
From 40100240a3702be8f8ceb88ec6643af669bd6de8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Sat, 1 Apr 2023 10:26:14 +0800
Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI
Subject: ARM: dts: meson8b: onecloud: Support HDMI
Signed-off-by: hzy <hzyitc@outlook.com>
---
.../arm/boot/dts/amlogic/meson8b-onecloud.dts | 58 +++++++++++++++++++
arch/arm/boot/dts/amlogic/meson8b-onecloud.dts | 58 ++++++++++
1 file changed, 58 insertions(+)
diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
index 1fa5420f..6ed19522 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
@@ -80,6 +80,48 @@ blue {
@ -92,5 +92,5 @@ index 1fa5420f..6ed19522 100644
status = "okay";
pinctrl-0 = <&ir_recv_pins>;
--
2.34.1
Armbian