Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Amlogic: bump linux to 6.7.3 #2821

Merged
merged 2 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/Amlogic/packages/linux/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PKG_PATCH_DIRS+="${DEVICE}"

case ${DEVICE} in
S922X*)
PKG_VERSION="6.6.15"
PKG_VERSION="6.7.3"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c1fe0ad8dd7141bf6a8a482506173e8842c7bdbe Mon Sep 17 00:00:00 2001
From 1a91f9330958781881fa5ca725e02ed1e425872a Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:12 +0100
Subject: [PATCH 01/49] dt-bindings: clk: g12a-clkc: add CTS_ENCL clock ids
Subject: [PATCH 01/52] dt-bindings: clk: g12a-clkc: add CTS_ENCL clock ids

Add new CLK ids for the CTS_ENCL and CTS_ENCL_SEL clocks
on G12A compatible SoCs.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 09b022b0874cf773fedc2d9d2af9bd74848f77fa Mon Sep 17 00:00:00 2001
From 3b9cc61391d80e2ca5c80a403502877583295ca7 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:17 +0100
Subject: [PATCH 02/49] clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks
Subject: [PATCH 02/52] clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks

Add new CTS_ENCL & CTS_ENCL_SEL clocks for the G12A compatible
SoCs, they are used to feed the VPU LCD Pixel encoder used for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 25c21aa6e55cd82988375310ebbad0b9bc8ed0da Mon Sep 17 00:00:00 2001
From c77cc0ea53614e915cc114c2484d46b4ec26b27e Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:18 +0100
Subject: [PATCH 03/49] clk: meson: add vclk driver
Subject: [PATCH 03/52] clk: meson: add vclk driver

The VCLK and VCLK_DIV clocks have supplementary bits.

Expand All @@ -28,7 +28,7 @@ Signed-off-by: Neil Armstrong <[email protected]>
create mode 100644 drivers/clk/meson/vclk.h

diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
index 135da8f2d0b1..83f629515e96 100644
index 29ffd14d267b..59a40a49f8e1 100644
--- a/drivers/clk/meson/Kconfig
+++ b/drivers/clk/meson/Kconfig
@@ -30,6 +30,10 @@ config COMMON_CLK_MESON_VID_PLL_DIV
Expand All @@ -51,7 +51,7 @@ index 135da8f2d0b1..83f629515e96 100644
help
Support for the clock controller on Amlogic S905D2, S905X2 and S905Y2
diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile
index cd961cc4f4db..6efeb8c7bd2a 100644
index 9ee4b954c896..9ba43fe7a07a 100644
--- a/drivers/clk/meson/Makefile
+++ b/drivers/clk/meson/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_COMMON_CLK_MESON_PLL) += clk-pll.o
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From fcbfbcf79f5a5206aee38d3c69875565dd6d6431 Mon Sep 17 00:00:00 2001
From 41b8f0f7c1271da5075790c32567356ade6354a1 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:19 +0100
Subject: [PATCH 04/49] clk: meson: g12a: make VCLK2 and ENCL clock path
Subject: [PATCH 04/52] clk: meson: g12a: make VCLK2 and ENCL clock path
configurable by CCF

In order to setup the DSI clock, let's make the unused VCLK2 clock path
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3649827ec3d7dff809938bdd03dd359e971c3cd4 Mon Sep 17 00:00:00 2001
From e82c6f42695cf10995bc8da338dc5ac26f96eeec Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:20 +0100
Subject: [PATCH 05/49] drm/meson: gate px_clk when setting rate
Subject: [PATCH 05/52] drm/meson: gate px_clk when setting rate

Disable the px_clk when setting the rate to recover a fully
configured and correctly reset VCLK clock tree after the rate
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f580f795fd23c1cd49b0c46973f6eb699ae48f1e Mon Sep 17 00:00:00 2001
From 939374231c85ca1a5f3b004f2c35c98a2fd8c8f3 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Fri, 24 Nov 2023 09:41:21 +0100
Subject: [PATCH 06/49] arm64: meson: g12-common: add the MIPI DSI nodes
Subject: [PATCH 06/52] arm64: meson: g12-common: add the MIPI DSI nodes

Add the MIPI DSI Analog & Digital PHY nodes and the DSI control
nodes with proper port endpoint to the VPU.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 520fe8137e67749a4388a2c0e15a6cee1cbb9bed Mon Sep 17 00:00:00 2001
From e262beaa756c677d6bcc35a01f33e656e1ea9cf6 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Tue, 14 Nov 2023 11:14:43 +0100
Subject: [PATCH 07/49] dt-bindings: clock: g12a-clkc: add MIPI ISP & CSI PHY
Subject: [PATCH 07/52] dt-bindings: clock: g12a-clkc: add MIPI ISP & CSI PHY
clock ids

Add MIPI ISP & CSI PHY clock ids to G12A clock bindings header
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 794aa5b737ffb710a43b3dde5893c9320ce789a3 Mon Sep 17 00:00:00 2001
From af34d91f6f2fbec3227864ba9b411dc7cebef8c6 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Tue, 14 Nov 2023 11:14:44 +0100
Subject: [PATCH 08/49] clk: meson: g12a: add MIPI ISP clocks
Subject: [PATCH 08/52] clk: meson: g12a: add MIPI ISP clocks

Add the MIPI ISP gate, divider and mux used to feed the MIPI CSI ISP
(Image Signal Processor) IP on the Amlogic G12B SoC.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b47a6aac842e16521f666615f802d1c32a244d9f Mon Sep 17 00:00:00 2001
From b02107a1e32e12e94ad34fc0cec7a9069fedf8b0 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <[email protected]>
Date: Tue, 14 Nov 2023 11:14:45 +0100
Subject: [PATCH 09/49] clk: meson: g12a: add CSI & ISP gates clocks
Subject: [PATCH 09/52] clk: meson: g12a: add CSI & ISP gates clocks

Add the gates entires for the CSI ISP domain and CSI PHYs.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a92e0edd59ffe9a5f8210ef99570165f8eae354d Mon Sep 17 00:00:00 2001
From 95513beef67654f8267129d1ffe927f3954c5b45 Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Tue, 23 Jan 2024 23:28:55 +0000
Subject: [PATCH 10/49] drm: panel: st7701: add odroid-go-ultra panel support
Subject: [PATCH 10/52] drm: panel: st7701: add odroid-go-ultra panel support

---
drivers/gpu/drm/panel/panel-sitronix-st7701.c | 162 +++++++++++++++++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b1ec05e594ac3efc54ee4efacdc6d33284d7a533 Mon Sep 17 00:00:00 2001
From 3a888febbad27e83fb7ee5ca3cc42e21c6f03e70 Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Tue, 23 Jan 2024 23:41:40 +0000
Subject: [PATCH 11/49] arm64: meson: odroid-go-ultra: add DSI panel
Subject: [PATCH 11/52] arm64: meson: odroid-go-ultra: add DSI panel

---
.../amlogic/meson-g12b-odroid-go-ultra.dts | 66 +++++++++++++++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f67ff8d0a59222f943869c7d9d2e0bd4a68ebcda Mon Sep 17 00:00:00 2001
From 42aec67c7c8265cd8864d543fa8ce758c99e515e Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <[email protected]>
Date: Tue, 23 Jan 2024 23:56:49 +0000
Subject: [PATCH 12/49] clk: meson: g12a: fix mipi display output for
Subject: [PATCH 12/52] clk: meson: g12a: fix mipi display output for
odroid-go-ultra

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 03ed1c5a21386b8128e4fb0a78e40ae33d2b476e Mon Sep 17 00:00:00 2001
From 3c44ee308121e22458f60d6406707de93a220fd8 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <[email protected]>
Date: Tue, 23 Jan 2024 23:53:24 +0000
Subject: [PATCH 13/49] arm64: meson: odroid-go-ultra: correct voltages
Subject: [PATCH 13/52] arm64: meson: odroid-go-ultra: correct voltages

---
.../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 +++++++---------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 243cf585f8efd4e4b2cc391d34c3092b6010637e Mon Sep 17 00:00:00 2001
From 00fac12be52d1d41794ac606438605fdb543b35d Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <[email protected]>
Date: Wed, 24 Jan 2024 10:56:00 +0000
Subject: [PATCH 14/49] arm64: meson: odroid-go-ultra: add over-clocking
Subject: [PATCH 14/52] arm64: meson: odroid-go-ultra: add over-clocking
frequencies

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 09fcf6de5d20897f95ea3c89bf5eab9c231449fb Mon Sep 17 00:00:00 2001
From 01548d9dae69de14abfded29733f024a257240fd Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Wed, 24 Jan 2024 11:37:48 +0000
Subject: [PATCH 15/50] arm64: meson: odroid-go-ultra: specify overclocking
Subject: [PATCH 15/52] arm64: meson: odroid-go-ultra: specify overclocking
frequencies as turbo mode

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 38fa893698684ad22da9e7c82c5b4edac57bb5d8 Mon Sep 17 00:00:00 2001
From e1e577d500d4c7b900bcd8540ec1b78b8e0180a9 Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <[email protected]>
Date: Wed, 24 Jan 2024 12:08:19 +0000
Subject: [PATCH 16/49] arm64: meson: odroid-go-ultra: remove adc joystick
Subject: [PATCH 16/52] arm64: meson: odroid-go-ultra: remove adc joystick

---
.../amlogic/meson-g12b-odroid-go-ultra.dts | 46 -------------------
1 file changed, 46 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index d13ac7f6c2ff..01d433769da8 100644
index 74e1a315bfb1..30c48311f165 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -21,52 +21,6 @@ aliases {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6e06d0c825f9cad2fdaf97f37581d069103a3b0e Mon Sep 17 00:00:00 2001
From 845048f145884967c58711c7e30010646737d529 Mon Sep 17 00:00:00 2001
From: brooksytech <[email protected]>
Date: Wed, 24 Jan 2024 16:18:45 +0000
Subject: [PATCH 17/49] drm: meson: venc: HACK: panic when gamma is not set
Subject: [PATCH 17/52] drm: meson: venc: HACK: panic when gamma is not set
correctly

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8ba55ed10c13f40ac110e55db1619a1f63f89dff Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
From 5e1dd25b818aa19a2b38485724a173cd7ef2d139 Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 22:12:01 +0000
Subject: [PATCH 18/49] gpiolib: of: revert api changes needed for joypad
Subject: [PATCH 18/52] gpiolib: of: revert api changes needed for joypad
driver

---
Expand All @@ -11,10 +11,10 @@ Subject: [PATCH 18/49] gpiolib: of: revert api changes needed for joypad
create mode 100644 include/linux/of_gpio_legacy.h

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index d9525d95e818..6291ef324a06 100644
index 402f7d99b0c1..c3b5a3aecfc7 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -398,6 +398,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
@@ -408,6 +408,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
return desc;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c8ebb2fd33117fa7474b6275e7d3989b9e1395ad Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
From 3122023c7fecb8ddfc8854f21fc6505fbe9c21ec Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:50:05 +0000
Subject: [PATCH 19/49] input: add input-polldev driver
Subject: [PATCH 19/52] input: add input-polldev driver

---
drivers/input/Kconfig | 13 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3f4861aa9f49f4fc7681c5c4caaa2922586e61ca Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
From cb2b7b195456a47c659e626c5b0cb4dc31a6440f Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:55:38 +0000
Subject: [PATCH 20/49] input: joystick: add odroid-go ultra-joypad driver
Subject: [PATCH 20/52] input: joystick: add odroid-go ultra-joypad driver

---
drivers/input/joystick/Kconfig | 6 +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 74abcbd59fda168ba65c6f106322012c84c151a0 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
From ccaded3e8dc6b07825ebcb3b84b3c1dfd2fb1826 Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:57:34 +0000
Subject: [PATCH 21/49] arm64: meson: odroid-go-ultra: add joypad
Subject: [PATCH 21/52] arm64: meson: odroid-go-ultra: add joypad

---
.../amlogic/meson-g12b-odroid-go-ultra.dts | 156 +++++++++++-------
1 file changed, 93 insertions(+), 63 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index 01d433769da8..11bd4939f283 100644
index 30c48311f165..595b2a76157e 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -34,9 +34,8 @@ codec_clk: codec-clk {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 90520a4c074557ab1586773f805aa2de47a27009 Mon Sep 17 00:00:00 2001
From 3f20fb0cc4ca7f835840e098126b2ec83d154e7f Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Wed, 24 Jan 2024 22:22:49 +0000
Subject: [PATCH 22/49] arm64: meson: odroid: disable heartbeat
Subject: [PATCH 22/52] arm64: meson: odroid: disable heartbeat

---
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index 11bd4939f283..9e2db8828f1f 100644
index 595b2a76157e..40820c49aacc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -194,7 +194,7 @@ leds {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 50b5516c38e61d9fa1435703d99f6ac87f37ad0f Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
From 2b8cc5ce6a09e843344b088625812c98ec96b765 Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Wed, 24 Jan 2024 23:56:58 +0000
Subject: [PATCH 23/49] arm64: meson: g12-common: add mali to dts
Subject: [PATCH 23/52] arm64: meson: g12-common: add mali to dts

---
.../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 +++++++++++-----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From 12c26f4f6e3ec2c9d7f2a0481fe0961854a463df Mon Sep 17 00:00:00 2001
From 8462fc8605c995ab5d1f3da2435c38969943337d Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Thu, 25 Jan 2024 00:32:40 +0000
Subject: [PATCH 24/49] arm64: meson: odroid-go-ultra: increase vddcpu_a
Subject: [PATCH 24/52] arm64: meson: odroid-go-ultra: increase vddcpu_a
voltage for overclock

---
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index 9e2db8828f1f..071f07e9e883 100644
index 40820c49aacc..05b3f3fe3867 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -421,7 +421,7 @@ vddcpu_a: DCDC_REG1 {
@@ -418,7 +418,7 @@ vddcpu_a: DCDC_REG1 {
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <775000>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 585646281aeb18bbcd74ab1e741f253dc4f348fd Mon Sep 17 00:00:00 2001
From 90f15beca9b52c0657b4b4cd8a18bfb9f8c7a82c Mon Sep 17 00:00:00 2001
From: adamg <[email protected]>
Date: Fri, 26 Jan 2024 17:55:02 +0000
Subject: [PATCH 25/50] arm64: meson: add dt for powkiddy-rgb10-max-3-pro
Subject: [PATCH 25/52] arm64: meson: add dt for powkiddy-rgb10-max-3-pro

---
.../meson-g12b-powkiddy-rgb10-max-3-pro.dts | 54 +++++++++++++++++++
Expand Down
Loading