diff --git a/patch/kernel/archive/meson64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch b/patch/kernel/archive/meson64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch index c31c4414f..393055343 100644 --- a/patch/kernel/archive/meson64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch +++ b/patch/kernel/archive/meson64-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch @@ -1,8 +1,8 @@ -From 7648741002eeb851ceb394864253445b77ea3d25 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 10 Apr 2024 08:25:37 -0400 -Subject: [PATCH] arm64: swiotlb: Reduce the default size if no ZONE_DMA - bouncing needed +Subject: arm64: swiotlb: Reduce the default size if no ZONE_DMA bouncing + needed With CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC enabled, the arm64 kernel still allocates the default SWIOTLB buffer (64MB) even if ZONE_DMA is disabled @@ -18,11 +18,11 @@ Cc: Ross Burton Cc: Will Deacon Reviewed-by: Robin Murphy --- - arch/arm64/mm/init.c | 11 ++++++++++- + arch/arm64/mm/init.c | 11 +++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 8a0f8604348b..8deec68028ac 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -16,6 +16,7 @@ @@ -52,5 +52,5 @@ index 8a0f8604348b..8deec68028ac 100644 swiotlb_init(swiotlb, SWIOTLB_VERBOSE); -- -2.39.2 +Armbian diff --git a/patch/kernel/archive/meson64-6.6/board-bananapi-cm4-cm4io.patch b/patch/kernel/archive/meson64-6.6/board-bananapi-cm4-cm4io.patch index 851a35a3b..e6bd53067 100644 --- a/patch/kernel/archive/meson64-6.6/board-bananapi-cm4-cm4io.patch +++ b/patch/kernel/archive/meson64-6.6/board-bananapi-cm4-cm4io.patch @@ -1,16 +1,16 @@ -From 5fb77258c07ec1cbad6f21d66bafde7c64a4f89a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 25 Jul 2023 13:31:54 -0400 -Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi cm4 +Subject: arch: arm64: dts: amlogic: meson g12b bananapi cm4 Signed-off-by: Patrick Yavitz --- - .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++++-- - .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++++-- + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++-- + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts -index 1b0c3881c6a1..027422f7a21b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts @@ -50,14 +50,15 @@ leds { @@ -43,7 +43,7 @@ index 1b0c3881c6a1..027422f7a21b 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -index 97e522921b06..b90097f07be9 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi @@ -12,6 +12,15 @@ aliases { @@ -73,12 +73,12 @@ index 97e522921b06..b90097f07be9 100644 }; }; -- -2.39.2 +Armbian -From cd42f604cd3298eb563c2d8788cbde1eb8e23970 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Sun, 8 Sep 2024 05:55:13 -0400 -Subject: [PATCH] BananaPi CM4: improve SDIO WiFi speeds +Subject: BananaPi CM4: improve SDIO WiFi speeds Signed-off-by: Patrick Yavitz --- @@ -86,10 +86,10 @@ Signed-off-by: Patrick Yavitz 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -index 995ce10d5c81..32cf5ae2ee36 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -@@ -294,8 +294,10 @@ &sd_emmc_a { +@@ -303,8 +303,10 @@ &sd_emmc_a { #size-cells = <0>; bus-width = <4>; @@ -101,7 +101,7 @@ index 995ce10d5c81..32cf5ae2ee36 100644 non-removable; disable-wp; -@@ -303,10 +305,13 @@ &sd_emmc_a { +@@ -312,10 +314,13 @@ &sd_emmc_a { /* WiFi firmware requires power in suspend */ keep-power-in-suspend; @@ -117,5 +117,5 @@ index 995ce10d5c81..32cf5ae2ee36 100644 status = "okay"; -- -2.39.2 +Armbian diff --git a/patch/kernel/archive/meson64-6.6/board-bananapi-m2s.patch b/patch/kernel/archive/meson64-6.6/board-bananapi-m2s.patch index 192aa2123..6737055ee 100644 --- a/patch/kernel/archive/meson64-6.6/board-bananapi-m2s.patch +++ b/patch/kernel/archive/meson64-6.6/board-bananapi-m2s.patch @@ -1,17 +1,17 @@ -From d1d8e18b9d0a923ad1bc2dee601b4034ff3cebd1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 25 Jul 2023 13:34:18 -0400 -Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi m2s +Subject: arch: arm64: dts: amlogic: meson g12b bananapi m2s Signed-off-by: Patrick Yavitz --- - .../boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++ - arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++ - .../boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts -index ac6f7ae1d103..55b691368598 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts @@ -18,6 +18,10 @@ aliases { @@ -26,7 +26,7 @@ index ac6f7ae1d103..55b691368598 100644 &i2c1 { status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -index 83709787eb91..af102061d1d7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -17,6 +17,15 @@ aliases { @@ -46,7 +46,7 @@ index 83709787eb91..af102061d1d7 100644 stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts -index 7f66f263a2ce..3295649664d7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts @@ -12,3 +12,7 @@ / { @@ -58,13 +58,12 @@ index 7f66f263a2ce..3295649664d7 100644 + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; +}; -- -2.39.2 +Armbian -From f30ce9d85c25cb404d51aad1636d6f9b455b13e6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Mon, 6 Nov 2023 08:53:24 -0500 -Subject: [PATCH] v2: arch: arm64: dts: amlogic: meson-g12b-bananapi-m2s: fan - control +Subject: v2: arch: arm64: dts: amlogic: meson-g12b-bananapi-m2s: fan control The fan on the unit is constantly running. So lets set thermal trip points and add the ability to control when we want it to @@ -72,14 +71,14 @@ kick on. By default it is set to power on at 60*C. Signed-off-by: Patrick Yavitz --- - .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 17 +++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 17 ++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -index af102061d1d7..5f0272269e4c 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -@@ -315,6 +315,23 @@ &cpu103 { +@@ -313,6 +313,23 @@ &cpu103 { clock-latency = <50000>; }; @@ -104,5 +103,5 @@ index af102061d1d7..5f0272269e4c 100644 pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; -- -2.39.2 +Armbian diff --git a/patch/kernel/archive/meson64-6.6/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch b/patch/kernel/archive/meson64-6.6/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch index 6b073a4c9..a7fc8f521 100644 --- a/patch/kernel/archive/meson64-6.6/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch +++ b/patch/kernel/archive/meson64-6.6/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch @@ -11,7 +11,7 @@ Signed-off-by: Igor Pecovnik 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -index 62404743e62d..875886137900 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -8,6 +8,7 @@ diff --git a/patch/kernel/archive/meson64-6.6/board-bananapim5-002-add-wifi-bt-support.patch b/patch/kernel/archive/meson64-6.6/board-bananapim5-002-add-wifi-bt-support.patch index f90cd2a0f..66db01e2c 100644 --- a/patch/kernel/archive/meson64-6.6/board-bananapim5-002-add-wifi-bt-support.patch +++ b/patch/kernel/archive/meson64-6.6/board-bananapim5-002-add-wifi-bt-support.patch @@ -13,7 +13,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index f045bf851638..5f6071ee84a6 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts @@ -25,6 +25,20 @@ cvbs_connector_in: endpoint { diff --git a/patch/kernel/archive/meson64-6.6/board-bananapism1-add-uart_A-and-AO_B.patch b/patch/kernel/archive/meson64-6.6/board-bananapism1-add-uart_A-and-AO_B.patch index f0fa29e95..2481c0c36 100644 --- a/patch/kernel/archive/meson64-6.6/board-bananapism1-add-uart_A-and-AO_B.patch +++ b/patch/kernel/archive/meson64-6.6/board-bananapism1-add-uart_A-and-AO_B.patch @@ -11,10 +11,10 @@ Signed-off-by: Patrick Yavitz 3 files changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index ff68b911b729..abc0483ff3b4 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -1900,6 +1900,15 @@ mux { +@@ -1905,6 +1905,15 @@ mux { }; }; @@ -31,7 +31,7 @@ index ff68b911b729..abc0483ff3b4 100644 mux { groups = "uart_ao_a_cts", diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts -index 586034316ec3..5ccdc91ac276 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts @@ -13,6 +13,10 @@ / { @@ -56,7 +56,7 @@ index 586034316ec3..5ccdc91ac276 100644 + pinctrl-0 = <&uart_a_pins>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -index 875886137900..e6e0cb67fb39 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -26,6 +26,7 @@ button-sw3 { diff --git a/patch/kernel/archive/meson64-6.6/board-khadas-vim3-fix-missing-i2c3-nod.patch b/patch/kernel/archive/meson64-6.6/board-khadas-vim3-fix-missing-i2c3-nod.patch index 6075bac3a..46cf86cb4 100644 --- a/patch/kernel/archive/meson64-6.6/board-khadas-vim3-fix-missing-i2c3-nod.patch +++ b/patch/kernel/archive/meson64-6.6/board-khadas-vim3-fix-missing-i2c3-nod.patch @@ -15,7 +15,7 @@ Signed-off-by: Christian Hewittt 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi -index 514a6dd4b124..5717e078783e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -332,6 +332,13 @@ hdmi_tx_tmds_out: endpoint { diff --git a/patch/kernel/archive/meson64-6.6/board-khadas-vims-add-rtc-vrtc-aliases.patch b/patch/kernel/archive/meson64-6.6/board-khadas-vims-add-rtc-vrtc-aliases.patch index cac8e7936..173fa7e50 100644 --- a/patch/kernel/archive/meson64-6.6/board-khadas-vims-add-rtc-vrtc-aliases.patch +++ b/patch/kernel/archive/meson64-6.6/board-khadas-vims-add-rtc-vrtc-aliases.patch @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index fea65f20523a..dacbca73279c 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -29,6 +29,8 @@ button-function { @@ -41,7 +41,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index 860f307494c5..cee27e7222c8 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -18,6 +18,8 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-nanopi-k2-add-uartC-alias.patch b/patch/kernel/archive/meson64-6.6/board-nanopi-k2-add-uartC-alias.patch index 61823ec98..f0e9918bd 100644 --- a/patch/kernel/archive/meson64-6.6/board-nanopi-k2-add-uartC-alias.patch +++ b/patch/kernel/archive/meson64-6.6/board-nanopi-k2-add-uartC-alias.patch @@ -10,7 +10,7 @@ add uartC alias for nanopi-k2 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -index 1fd2e56e6b08..636a814bd5d5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -15,6 +15,7 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-nanopi-k2-enable-emmc.patch b/patch/kernel/archive/meson64-6.6/board-nanopi-k2-enable-emmc.patch index 08970344c..1ca16d7ef 100644 --- a/patch/kernel/archive/meson64-6.6/board-nanopi-k2-enable-emmc.patch +++ b/patch/kernel/archive/meson64-6.6/board-nanopi-k2-enable-emmc.patch @@ -9,7 +9,7 @@ Subject: nanopik2 - enable eMMC 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -index 636a814bd5d5..14885e489241 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -358,7 +358,7 @@ &sd_emmc_b { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-add-uartA-uartC.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-add-uartA-uartC.patch index d88556aea..9388fecc5 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-add-uartA-uartC.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-add-uartA-uartC.patch @@ -14,7 +14,7 @@ add uartA and uartC for Odroid-C2 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index e6d2de7c45a9..c6a38d890db5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -17,6 +17,8 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch index d398d73ac..7c070a0ab 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch @@ -11,7 +11,7 @@ Odroid C2 enable SPI 1 file changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index c6a38d890db5..73ad65fad0d7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -176,6 +176,32 @@ hdmi_connector_in: endpoint { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch index 816f08282..be0dc2ae9 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch @@ -9,7 +9,7 @@ Enable odroidc2-dev DVFS (#763) 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index 73ad65fad0d7..f99f8414d8e0 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -360,7 +360,8 @@ &saradc { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 5b9e80fe5..e3c996b6c 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -16,10 +16,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0ff47eeffb49..fd94382c3fcc 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5903,7 +5903,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5933,7 +5933,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc4-reset.patch b/patch/kernel/archive/meson64-6.6/board-odroidc4-reset.patch index 2706f36ab..8ad61c277 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc4-reset.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc4-reset.patch @@ -10,7 +10,7 @@ bring back fixed version of `odroid-reboot` driver (Fix reboot on odroid C4 when 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -index d04768a66bfe..e0b7aca25d21 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts @@ -11,6 +11,16 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidhc4-enable-fan1_input.patch b/patch/kernel/archive/meson64-6.6/board-odroidhc4-enable-fan1_input.patch index 69fcc7fb2..26720cb2e 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidhc4-enable-fan1_input.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidhc4-enable-fan1_input.patch @@ -10,7 +10,7 @@ Subject: ODROID-HC4: add DT attributes to enable fan1_input 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index 846a2d6c20e5..e54832142690 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts @@ -21,6 +21,10 @@ fan0: pwm-fan { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidn2plus-Add-missing-CPU-opp.patch b/patch/kernel/archive/meson64-6.6/board-odroidn2plus-Add-missing-CPU-opp.patch index 261fbf133..d6511912b 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidn2plus-Add-missing-CPU-opp.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidn2plus-Add-missing-CPU-opp.patch @@ -9,7 +9,7 @@ Signed-off-by: Igor Pecovnik 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi -index 8e9ad1e51d66..adc4cca55d7d 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi @@ -45,6 +45,14 @@ opp-1800000000 { diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch index 4f2ab4c12..720442f12 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch @@ -9,7 +9,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index fcd7e1d8e16f..2e4646e255ad 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -15,6 +15,18 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch index 2f9afba7c..4a30618a9 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch @@ -23,7 +23,7 @@ Signed-off-by: Yuntian Zhang 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index 2e4646e255ad..9dd5e6c2583d 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -72,6 +72,14 @@ sdio_pwrseq: sdio-pwrseq { diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch index 174932bca..3e6be0522 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch @@ -1,13 +1,17 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chen Jiali Date: Tue, 23 Apr 2024 16:05:42 +0800 -Subject: [PATCH 1/1] Reduce eMMC frequency to improve compatibility +Subject: Reduce eMMC frequency to improve compatibility + +--- + arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index cf0a9be83..29ace14b4 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -358,7 +358,7 @@ &sd_emmc_c { +@@ -409,7 +409,7 @@ &sd_emmc_c { cap-mmc-highspeed; mmc-ddr-1_8v; mmc-hs200-1_8v; @@ -16,3 +20,6 @@ index cf0a9be83..29ace14b4 100644 disable-wp; mmc-pwrseq = <&emmc_pwrseq>; +-- +Armbian + diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch index e1fc8083a..d7aea9f2b 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch @@ -12,7 +12,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index 9dd5e6c2583d..65a49891466f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -361,7 +361,7 @@ &sd_emmc_a { diff --git a/patch/kernel/archive/meson64-6.6/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.6/board-t95z-add-rc-remote-keymap.patch index b6cfc0617..3a8de01b1 100644 --- a/patch/kernel/archive/meson64-6.6/board-t95z-add-rc-remote-keymap.patch +++ b/patch/kernel/archive/meson64-6.6/board-t95z-add-rc-remote-keymap.patch @@ -19,7 +19,7 @@ Signed-off-by: Christian Hewitt 5 files changed, 80 insertions(+) diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml -index 7bbe580c80f7..dc53a1cbf6fd 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/media/rc.yaml +++ b/Documentation/devicetree/bindings/media/rc.yaml @@ -127,6 +127,7 @@ properties: @@ -31,10 +31,10 @@ index 7bbe580c80f7..dc53a1cbf6fd 100644 - rc-tanix-tx3mini - rc-tanix-tx5max diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 573578db9509..3faab01160cf 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1324,6 +1324,8 @@ patternProperties: +@@ -1326,6 +1326,8 @@ patternProperties: description: Sundance DSP Inc. "^sunplus,.*": description: Sunplus Technology Co., Ltd. @@ -44,7 +44,7 @@ index 573578db9509..3faab01160cf 100644 description: Sun Microsystems, Inc "^supermicro,.*": diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile -index f19558fdab0c..8f8466ea9dad 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile @@ -107,6 +107,7 @@ obj-$(CONFIG_RC_MAP) += \ @@ -57,7 +57,7 @@ index f19558fdab0c..8f8466ea9dad 100644 rc-tanix-tx5max.o \ diff --git a/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c new file mode 100644 -index 000000000000..aaaf6b1c0045 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c @@ -0,0 +1,75 @@ @@ -137,7 +137,7 @@ index 000000000000..aaaf6b1c0045 +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Christian Hewitt "); diff --git a/include/media/rc-map.h b/include/media/rc-map.h -index 4676545ffd8f..770527edee1d 100644 +index 111111111111..222222222222 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h @@ -314,6 +314,7 @@ struct rc_map *rc_map_get(const char *name); diff --git a/patch/kernel/archive/meson64-6.6/driver-power-meson64-reset.patch b/patch/kernel/archive/meson64-6.6/driver-power-meson64-reset.patch index dcca65d8a..7197289a5 100644 --- a/patch/kernel/archive/meson64-6.6/driver-power-meson64-reset.patch +++ b/patch/kernel/archive/meson64-6.6/driver-power-meson64-reset.patch @@ -10,7 +10,7 @@ Subject: pyavitz meson64-generalized `odroid-reboot` driver 3 files changed, 194 insertions(+) diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig -index 411e00b255d6..a47ce2a431d6 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -148,6 +148,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF @@ -28,7 +28,7 @@ index 411e00b255d6..a47ce2a431d6 100644 tristate "Intel PIIX4 power-off driver" depends on PCI diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile -index a95d1bd275d1..c51d43d85ba0 100644 +index 111111111111..222222222222 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o @@ -41,7 +41,7 @@ index a95d1bd275d1..c51d43d85ba0 100644 obj-$(CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF) += odroid-go-ultra-poweroff.o diff --git a/drivers/power/reset/meson64-reboot.c b/drivers/power/reset/meson64-reboot.c new file mode 100644 -index 000000000000..5dafbf117deb +index 000000000000..111111111111 --- /dev/null +++ b/drivers/power/reset/meson64-reboot.c @@ -0,0 +1,186 @@ diff --git a/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch index 4e06b4999..4cd41f008 100644 --- a/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch @@ -1,20 +1,137 @@ -rom 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: John Doe -Date: Wed, 14 Aug 2024 16:52:59 +0000 -Subject: rockchip64: current: drv:spi:spidev remove warnings +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: zador-blood-stained +Date: Sat, 4 Mar 2017 00:12:55 +0300 +Subject: [ARCHEOLOGY] Remove SPIdev warnings -Signed-off-by: John Doe +> X-Git-Archeology: - Revision c43b20256817031186bf78574d589f68cea46779: https://github.com/armbian/build/commit/c43b20256817031186bf78574d589f68cea46779 +> X-Git-Archeology: Date: Sat, 04 Mar 2017 00:12:55 +0300 +> X-Git-Archeology: From: zador-blood-stained +> X-Git-Archeology: Subject: Remove SPIdev warnings +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2c08ec8f5a210de35f9482f482ac01ea15381792: https://github.com/armbian/build/commit/2c08ec8f5a210de35f9482f482ac01ea15381792 +> X-Git-Archeology: Date: Thu, 24 May 2018 13:32:29 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Merge sunxi family into stable +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1a12994e79b6ef173dc58efe4df8919cb6cc7781: https://github.com/armbian/build/commit/1a12994e79b6ef173dc58efe4df8919cb6cc7781 +> X-Git-Archeology: Date: Tue, 17 Jul 2018 15:53:30 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Moving sunxi-next to 4.17.y (#1049) +> X-Git-Archeology: +> X-Git-Archeology: - Revision a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72: https://github.com/armbian/build/commit/a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72 +> X-Git-Archeology: Date: Tue, 21 Aug 2018 10:41:10 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Reverting sunxi/sunxi64 NEXT to 4.14. (#1087) +> X-Git-Archeology: +> X-Git-Archeology: - Revision adeb736f8edd153f0144d80a6928dee89b8e9bc6: https://github.com/armbian/build/commit/adeb736f8edd153f0144d80a6928dee89b8e9bc6 +> X-Git-Archeology: Date: Wed, 03 Jul 2019 21:28:48 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: sunxi-dev: fix the same spi bug as in sunxi-next, remove deprecated patches and adjust one +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 990798c3fbfb208b1e333d7e589f01f015e92539: https://github.com/armbian/build/commit/990798c3fbfb208b1e333d7e589f01f015e92539 +> X-Git-Archeology: Date: Sat, 05 Feb 2022 21:53:26 +0100 +> X-Git-Archeology: From: The-going <48602507+The-going@users.noreply.github.com> +> X-Git-Archeology: Subject: Patching sunxi 5.15 (#3460) +> X-Git-Archeology: +> X-Git-Archeology: - Revision ca478cc4e563655d99fd3380d3b1217481d6da7e: https://github.com/armbian/build/commit/ca478cc4e563655d99fd3380d3b1217481d6da7e +> X-Git-Archeology: Date: Thu, 12 May 2022 19:11:40 +0200 +> X-Git-Archeology: From: The-going <48602507+The-going@users.noreply.github.com> +> X-Git-Archeology: Subject: Bugfix spidev (#3737) +> X-Git-Archeology: +> X-Git-Archeology: - Revision e7bd9b8f13af9ee054f44a422b2aca19746b9244: https://github.com/armbian/build/commit/e7bd9b8f13af9ee054f44a422b2aca19746b9244 +> X-Git-Archeology: Date: Sat, 28 May 2022 08:56:19 +0200 +> X-Git-Archeology: From: Tony +> X-Git-Archeology: Subject: Add Spidev workarounds and clean patches (WIP) (#3812) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 73691a9e24440e0a8104b2c25d168ba8947a10ad: https://github.com/armbian/build/commit/73691a9e24440e0a8104b2c25d168ba8947a10ad +> X-Git-Archeology: Date: Thu, 04 Aug 2022 21:50:40 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: meson64: edge: rework to kernel 5.19 (#3941) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1b12209ded2c356df514e3dd99bd945c0afd7a32: https://github.com/armbian/build/commit/1b12209ded2c356df514e3dd99bd945c0afd7a32 +> X-Git-Archeology: Date: Tue, 25 Oct 2022 20:38:31 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bump meson64 edge to 6.0.y (#4341) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 5b46bd7273909a2a9688efe85c4d45d00d407865: https://github.com/armbian/build/commit/5b46bd7273909a2a9688efe85c4d45d00d407865 +> X-Git-Archeology: Date: Mon, 12 Dec 2022 08:02:25 +0100 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64-6.0` kernel patches: mbox formatting, archeology to find lost authors/descriptions; rebase against 6.0.12; no actual changes (#4546) +> X-Git-Archeology: +> X-Git-Archeology: - Revision eb7d4a0bd20e56118f9c8c9089c063154c58a239: https://github.com/armbian/build/commit/eb7d4a0bd20e56118f9c8c9089c063154c58a239 +> X-Git-Archeology: Date: Mon, 12 Dec 2022 08:02:49 +0100 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64`: bump `edge` to `6.1-rc8` (#4554) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 321fec6f41fdaa1504755b1a7864415f3c518584: https://github.com/armbian/build/commit/321fec6f41fdaa1504755b1a7864415f3c518584 +> X-Git-Archeology: Date: Mon, 09 Jan 2023 08:22:23 +0100 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: meson64: 6.1.y/edge: rebase patches against v6.1.4 (no actual changes) (#4673) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 80dffbc7611bd76d675fcf74d352e1c55ce51f29: https://github.com/armbian/build/commit/80dffbc7611bd76d675fcf74d352e1c55ce51f29 +> X-Git-Archeology: Date: Tue, 10 Jan 2023 00:31:35 +0100 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64`: `edge`: bump to `6.2` - copy patches as-is from 6.1 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 64f9cf9b462c40a946a6a6f802cdb53db4b51b20: https://github.com/armbian/build/commit/64f9cf9b462c40a946a6a6f802cdb53db4b51b20 +> X-Git-Archeology: Date: Sat, 18 Feb 2023 07:46:21 -0300 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64`: edge/6.2: rebase onto `v6.2-rc5` +> X-Git-Archeology: +> X-Git-Archeology: - Revision 755479f40791a7038a3af92b2ccdc2d4b46d06f6: https://github.com/armbian/build/commit/755479f40791a7038a3af92b2ccdc2d4b46d06f6 +> X-Git-Archeology: Date: Tue, 28 Feb 2023 18:54:28 -0300 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: meson64: edge: rebase patches onto `v6.2.1`; fix mbox for recently added patch (no actual changes) +> X-Git-Archeology: +> X-Git-Archeology: - Revision e430fb090f87cae215645866009a6bf53e1f0ddc: https://github.com/armbian/build/commit/e430fb090f87cae215645866009a6bf53e1f0ddc +> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:47 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64` `edge` 6.4: simple fix for drv-spi-spidev-remove-warnings.patch +> X-Git-Archeology: +> X-Git-Archeology: - Revision 38d34e52698eb651866f6586ed4b9e838b76413c: https://github.com/armbian/build/commit/38d34e52698eb651866f6586ed4b9e838b76413c +> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:47 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64` `edge` 6.4: initial copy (as-is) of 6.2 patches +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2230db629924ae0c88de9d8402d5c754d8701c88: https://github.com/armbian/build/commit/2230db629924ae0c88de9d8402d5c754d8701c88 +> X-Git-Archeology: Date: Sat, 02 Sep 2023 14:47:46 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64`/`edge`: bump to 6.5.y; rebase all patches vs `v6.5`(.0) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 3811f36a998aa62e382dfd9cb9284196d9b3a5f0: https://github.com/armbian/build/commit/3811f36a998aa62e382dfd9cb9284196d9b3a5f0 +> X-Git-Archeology: Date: Tue, 03 Oct 2023 13:53:40 +0200 +> X-Git-Archeology: From: Ricardo Pardini +> X-Git-Archeology: Subject: `meson64`/`edge`: bump to `6.6-rc4`; initial copy from 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1ffdab4fe47413fca5438afe2c98828c6bb955ea: https://github.com/armbian/build/commit/1ffdab4fe47413fca5438afe2c98828c6bb955ea +> X-Git-Archeology: Date: Wed, 14 Aug 2024 17:39:38 -0400 +> X-Git-Archeology: From: Alessandro Lannocca +> X-Git-Archeology: Subject: meson64: current: refresh drv-spi-spidev-remove-warnings.patch +> X-Git-Archeology: +> X-Git-Archeology: - Revision a53be7e6220ff365c3d745e4fac1c79ea5fd12d4: https://github.com/armbian/build/commit/a53be7e6220ff365c3d745e4fac1c79ea5fd12d4 +> X-Git-Archeology: Date: Tue, 01 Oct 2024 14:17:50 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Adjust patches due to kernel bump +> X-Git-Archeology: --- drivers/spi/spidev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index b97206d47..d32b3f018 100644 +index 111111111111..222222222222 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -702,10 +702,11 @@ static const struct file_operations spidev_fops = { - */ - +@@ -704,6 +704,7 @@ static const struct file_operations spidev_fops = { static struct class *spidev_class; static const struct spi_device_id spidev_spi_ids[] = { @@ -22,11 +139,7 @@ index b97206d47..d32b3f018 100644 { .name = "bh2228fv" }, { .name = "dh2228fv" }, { .name = "jg10309-01" }, - { .name = "ltc2488" }, - { .name = "sx1301" }, -@@ -731,10 +732,11 @@ static int spidev_of_check(struct device *dev) - dev_err(dev, "spidev listed directly in DT is not supported\n"); - return -EINVAL; +@@ -734,6 +735,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { @@ -34,8 +147,6 @@ index b97206d47..d32b3f018 100644 { .compatible = "cisco,spi-petra", .data = &spidev_of_check }, { .compatible = "dh,dhcom-board", .data = &spidev_of_check }, { .compatible = "elgin,jg10309-01", .data = &spidev_of_check }, - { .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check }, - { .compatible = "lwn,bk4", .data = &spidev_of_check }, -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/kernel/archive/meson64-6.6/general-add-Amlogic-Meson-GX-PM-Suspend.patch b/patch/kernel/archive/meson64-6.6/general-add-Amlogic-Meson-GX-PM-Suspend.patch index 38d6c025f..c4fc44b09 100644 --- a/patch/kernel/archive/meson64-6.6/general-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/patch/kernel/archive/meson64-6.6/general-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -16,7 +16,7 @@ Signed-off-by: Neil Armstrong 3 files changed, 93 insertions(+) diff --git a/drivers/firmware/meson/Kconfig b/drivers/firmware/meson/Kconfig -index f2fdd3756648..d3ead92ac61b 100644 +index 111111111111..222222222222 100644 --- a/drivers/firmware/meson/Kconfig +++ b/drivers/firmware/meson/Kconfig @@ -9,3 +9,9 @@ config MESON_SM @@ -30,7 +30,7 @@ index f2fdd3756648..d3ead92ac61b 100644 + help + Say y here to enable the Amlogic GX SoC Power Management diff --git a/drivers/firmware/meson/Makefile b/drivers/firmware/meson/Makefile -index c6c09483b622..0193cdfee32f 100644 +index 111111111111..222222222222 100644 --- a/drivers/firmware/meson/Makefile +++ b/drivers/firmware/meson/Makefile @@ -1,2 +1,3 @@ @@ -39,7 +39,7 @@ index c6c09483b622..0193cdfee32f 100644 +obj-$(CONFIG_MESON_GX_PM) += meson_gx_pm.o diff --git a/drivers/firmware/meson/meson_gx_pm.c b/drivers/firmware/meson/meson_gx_pm.c new file mode 100644 -index 000000000000..c104c2e4c77f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/firmware/meson/meson_gx_pm.c @@ -0,0 +1,86 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-add-overlay-compilation-support.patch b/patch/kernel/archive/meson64-6.6/general-add-overlay-compilation-support.patch index 65f5c5b01..af0291094 100644 --- a/patch/kernel/archive/meson64-6.6/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/meson64-6.6/general-add-overlay-compilation-support.patch @@ -11,7 +11,7 @@ Subject: add overlay-compilation-support to meson64-dev 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore -index 8c759326baf4..e6ce8f6ad4b1 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/.gitignore +++ b/arch/arm/boot/.gitignore @@ -4,3 +4,5 @@ zImage @@ -21,7 +21,7 @@ index 8c759326baf4..e6ce8f6ad4b1 100644 +*.dtb* +*.scr diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 4405d5b67578..04df2e7c8453 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -18,9 +18,12 @@ include $(srctree)/scripts/Kbuild.include @@ -55,7 +55,7 @@ index 4405d5b67578..04df2e7c8453 100644 $(subdirs): $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@)) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 68d0134bdbf9..9ea801a22569 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -343,6 +343,9 @@ DTC ?= $(objtree)/scripts/dtc/dtc @@ -68,7 +68,7 @@ index 68d0134bdbf9..9ea801a22569 100644 # Disable noisy checks by default ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) DTC_FLAGS += -Wno-unit_address_vs_reg \ -@@ -421,6 +424,23 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE +@@ -425,6 +428,23 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE $(call if_changed_dep,dtc) diff --git a/patch/kernel/archive/meson64-6.6/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patch b/patch/kernel/archive/meson64-6.6/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patch index b0ac0522a..360f4ac7b 100644 --- a/patch/kernel/archive/meson64-6.6/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/patch/kernel/archive/meson64-6.6/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -68,7 +68,7 @@ Signed-off-by: Heiner Kallweit diff --git a/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628 b/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628 new file mode 100644 -index 000000000000..382757e721af +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628 @@ -0,0 +1,7 @@ @@ -81,7 +81,7 @@ index 000000000000..382757e721af + can not be displayed in a readable way with 7 segments. diff --git a/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml b/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml new file mode 100644 -index 000000000000..d9cbbc950aab +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml @@ -0,0 +1,82 @@ @@ -168,7 +168,7 @@ index 000000000000..d9cbbc950aab + }; +... diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig -index 64012cda4d12..2764afc5c5d9 100644 +index 111111111111..222222222222 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -203,6 +203,17 @@ config ARM_CHARLCD @@ -190,7 +190,7 @@ index 64012cda4d12..2764afc5c5d9 100644 tristate "Parallel port LCD/Keypad Panel support" depends on PARPORT diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile -index 6968ed4d3f0a..7728e17e1c5a 100644 +index 111111111111..222222222222 100644 --- a/drivers/auxdisplay/Makefile +++ b/drivers/auxdisplay/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_HT16K33) += ht16k33.o @@ -200,7 +200,7 @@ index 6968ed4d3f0a..7728e17e1c5a 100644 +obj-$(CONFIG_TM1628) += tm1628.o diff --git a/drivers/auxdisplay/tm1628.c b/drivers/auxdisplay/tm1628.c new file mode 100644 -index 000000000000..4d99a7aa077b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/auxdisplay/tm1628.c @@ -0,0 +1,376 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch b/patch/kernel/archive/meson64-6.6/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch index 2c2d0dddc..e7d09fac1 100644 --- a/patch/kernel/archive/meson64-6.6/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch +++ b/patch/kernel/archive/meson64-6.6/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch @@ -10,7 +10,7 @@ Unknown patch. Archeology: 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 6c1d79474505..a6c205bb4164 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable) diff --git a/patch/kernel/archive/meson64-6.6/general-drm-panfrost-fix-reference-leak.patch b/patch/kernel/archive/meson64-6.6/general-drm-panfrost-fix-reference-leak.patch index b7431fb5a..828307cd8 100644 --- a/patch/kernel/archive/meson64-6.6/general-drm-panfrost-fix-reference-leak.patch +++ b/patch/kernel/archive/meson64-6.6/general-drm-panfrost-fix-reference-leak.patch @@ -21,7 +21,7 @@ Signed-off-by: Qinglang Miao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c -index a8b4827dc425..90acafb4ea7a 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -194,7 +194,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) diff --git a/patch/kernel/archive/meson64-6.6/general-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/meson64-6.6/general-fix-Kodi-sysinfo-CPU-information.patch index b51e8c9f0..ad47c766f 100644 --- a/patch/kernel/archive/meson64-6.6/general-fix-Kodi-sysinfo-CPU-information.patch +++ b/patch/kernel/archive/meson64-6.6/general-fix-Kodi-sysinfo-CPU-information.patch @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 98fda8500535..945030a5caf6 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -189,8 +189,7 @@ static int c_show(struct seq_file *m, void *v) diff --git a/patch/kernel/archive/meson64-6.6/general-gpu-drm-add-new-display-resolution-2560x1440.patch b/patch/kernel/archive/meson64-6.6/general-gpu-drm-add-new-display-resolution-2560x1440.patch index 6336c1816..58d2d1688 100644 --- a/patch/kernel/archive/meson64-6.6/general-gpu-drm-add-new-display-resolution-2560x1440.patch +++ b/patch/kernel/archive/meson64-6.6/general-gpu-drm-add-new-display-resolution-2560x1440.patch @@ -12,7 +12,7 @@ Signed-off-by: Dongjin Kim 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c -index 2a82119eb58e..eb4c251d79b7 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c @@ -357,6 +357,8 @@ enum { @@ -55,7 +55,7 @@ index 2a82119eb58e..eb4c251d79b7 100644 meson_hdmi_pll_set_params(priv, m, frac, od1, od2, od3); diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c -index 3bf0d6e4fc30..c981d708240f 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -868,7 +868,7 @@ meson_venc_hdmi_supported_mode(const struct drm_display_mode *mode) diff --git a/patch/kernel/archive/meson64-6.6/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.6/general-input-touchscreen-Add-D-WAV-Multitouch.patch index e55917b5a..3fd227409 100644 --- a/patch/kernel/archive/meson64-6.6/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.6/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -13,10 +13,10 @@ Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71 5 files changed, 574 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index e4d2dfd5d253..28543327a2df 100644 +index 111111111111..222222222222 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1457,4 +1457,10 @@ +@@ -1464,4 +1464,10 @@ #define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 @@ -28,10 +28,10 @@ index e4d2dfd5d253..28543327a2df 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 3983b4f282f8..38217748b1ec 100644 +index 111111111111..222222222222 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -888,6 +888,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -891,6 +891,9 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) }, #endif { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, @@ -42,7 +42,7 @@ index 3983b4f282f8..38217748b1ec 100644 }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig -index e3e2324547b9..2e829e2552d3 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -1399,4 +1399,14 @@ config TOUCHSCREEN_HIMAX_HX83112B @@ -61,7 +61,7 @@ index e3e2324547b9..2e829e2552d3 100644 + endif diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile -index 62bd24f3ac8e..51ddd5304d79 100644 +index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o @@ -72,7 +72,7 @@ index 62bd24f3ac8e..51ddd5304d79 100644 obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c new file mode 100644 -index 000000000000..7ec8b6dd15fd +index 000000000000..111111111111 --- /dev/null +++ b/drivers/input/touchscreen/dwav-usb-mt.c @@ -0,0 +1,554 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-media-cec-silence-CEC-timeout-message-HACK.patch b/patch/kernel/archive/meson64-6.6/general-media-cec-silence-CEC-timeout-message-HACK.patch index 513b386dd..4905e2e4f 100644 --- a/patch/kernel/archive/meson64-6.6/general-media-cec-silence-CEC-timeout-message-HACK.patch +++ b/patch/kernel/archive/meson64-6.6/general-media-cec-silence-CEC-timeout-message-HACK.patch @@ -19,10 +19,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c -index 09ca83c23329..e86b8e3f463c 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c -@@ -501,9 +501,9 @@ int cec_thread_func(void *_adap) +@@ -510,9 +510,9 @@ int cec_thread_func(void *_adap) * default). */ if (adap->transmitting) { diff --git a/patch/kernel/archive/meson64-6.6/general-memory-marked-nomap.patch b/patch/kernel/archive/meson64-6.6/general-memory-marked-nomap.patch index 09b2642d0..27fd0f829 100644 --- a/patch/kernel/archive/meson64-6.6/general-memory-marked-nomap.patch +++ b/patch/kernel/archive/meson64-6.6/general-memory-marked-nomap.patch @@ -14,10 +14,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 9 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index bf502ba8da95..0789f61be489 100644 +index 111111111111..222222222222 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -480,15 +480,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, +@@ -481,15 +481,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) { diff --git a/patch/kernel/archive/meson64-6.6/general-meson-aiu-Fix-HDMI-codec-control-selection.patch b/patch/kernel/archive/meson64-6.6/general-meson-aiu-Fix-HDMI-codec-control-selection.patch index 8378e4939..70d874407 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-aiu-Fix-HDMI-codec-control-selection.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-aiu-Fix-HDMI-codec-control-selection.patch @@ -59,7 +59,7 @@ Signed-off-by: Martin Blumenstingl 2 files changed, 80 insertions(+), 34 deletions(-) diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c -index ee0ef6301010..d074e29f6d0b 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/meson/aiu-codec-ctrl.c +++ b/sound/soc/meson/aiu-codec-ctrl.c @@ -12,14 +12,60 @@ @@ -204,7 +204,7 @@ index ee0ef6301010..d074e29f6d0b 100644 static const struct snd_soc_dapm_widget aiu_hdmi_ctrl_widgets[] = { diff --git a/sound/soc/meson/aiu-encoder-i2s.c b/sound/soc/meson/aiu-encoder-i2s.c -index a0dd914c8ed1..21916034a46d 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/meson/aiu-encoder-i2s.c +++ b/sound/soc/meson/aiu-encoder-i2s.c @@ -23,7 +23,6 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch b/patch/kernel/archive/meson64-6.6/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch index 92136891b..a0894a748 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch @@ -16,7 +16,7 @@ Signed-off-by: Vyacheslav Bocharov 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 9837dab096e6..30404107f85d 100644 +index 111111111111..222222222222 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -27,6 +27,7 @@ @@ -64,7 +64,7 @@ index 9837dab096e6..30404107f85d 100644 writel(clk_reg, host->regs + SD_EMMC_CLOCK); diff --git a/include/dt-bindings/mmc/meson-gx-mmc.h b/include/dt-bindings/mmc/meson-gx-mmc.h new file mode 100644 -index 000000000000..cfc4a9d75b2b +index 000000000000..111111111111 --- /dev/null +++ b/include/dt-bindings/mmc/meson-gx-mmc.h @@ -0,0 +1,35 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch b/patch/kernel/archive/meson64-6.6/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch index 88f85a73d..000c9fe0b 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch @@ -12,7 +12,7 @@ Signed-off-by: Vyacheslav Bocharov 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -index 768d0ed78dbe..892a5f147e6d 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -13,6 +13,7 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patch b/patch/kernel/archive/meson64-6.6/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patch index 8b22e4bf5..3eb3b8314 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patch @@ -20,7 +20,7 @@ Signed-off-by: Vyacheslav Bocharov 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml -index bc403ae9e5d9..176c8854f613 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml @@ -51,6 +51,16 @@ properties: diff --git a/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-HEVC-decode-codec.patch b/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-HEVC-decode-codec.patch index 99b887bbe..44e1694e0 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-HEVC-decode-codec.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-HEVC-decode-codec.patch @@ -14,7 +14,7 @@ Unknown patch. From LibreELEC? 6 files changed, 1505 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/meson/vdec/Makefile b/drivers/staging/media/meson/vdec/Makefile -index 6e726af84ac9..16f848e456b9 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/Makefile +++ b/drivers/staging/media/meson/vdec/Makefile @@ -3,6 +3,6 @@ @@ -27,7 +27,7 @@ index 6e726af84ac9..16f848e456b9 100644 obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c new file mode 100644 -index 000000000000..3a6fd04a2d33 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/staging/media/meson/vdec/codec_hevc.c @@ -0,0 +1,1440 @@ @@ -1473,7 +1473,7 @@ index 000000000000..3a6fd04a2d33 +}; diff --git a/drivers/staging/media/meson/vdec/codec_hevc.h b/drivers/staging/media/meson/vdec/codec_hevc.h new file mode 100644 -index 000000000000..f2f9b2464df1 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/staging/media/meson/vdec/codec_hevc.h @@ -0,0 +1,13 @@ @@ -1491,7 +1491,7 @@ index 000000000000..f2f9b2464df1 + +#endif diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 4632346f04a9..6e0500bb807d 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -308,7 +308,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) @@ -1504,7 +1504,7 @@ index 4632346f04a9..6e0500bb807d 100644 num_dst_bufs = codec_ops->num_pending_bufs(sess); diff --git a/drivers/staging/media/meson/vdec/hevc_regs.h b/drivers/staging/media/meson/vdec/hevc_regs.h -index 0392f41a1eed..e7eabdd2b119 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/hevc_regs.h +++ b/drivers/staging/media/meson/vdec/hevc_regs.h @@ -205,6 +205,7 @@ @@ -1516,7 +1516,7 @@ index 0392f41a1eed..e7eabdd2b119 100644 #define HEVC_SAO_MMU_VH1_ADDR 0xd8ec diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index 70c9fd7c8bc5..04ed5c2d6fd9 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -11,6 +11,7 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-handling-to-HEVC-decoder-.patch b/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-handling-to-HEVC-decoder-.patch index 85e5cba51..0db5d1468 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-handling-to-HEVC-decoder-.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-vdec-add-handling-to-HEVC-decoder-.patch @@ -15,7 +15,7 @@ playback as no new frames could be placed in the decoded picture buffer. 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c -index 3a6fd04a2d33..01218efde99b 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/codec_hevc.c +++ b/drivers/staging/media/meson/vdec/codec_hevc.c @@ -223,6 +223,7 @@ struct hevc_frame { diff --git a/patch/kernel/archive/meson64-6.6/general-meson-vdec-check-if-parser-has-really-parser.patch b/patch/kernel/archive/meson64-6.6/general-meson-vdec-check-if-parser-has-really-parser.patch index 6a987f0ec..068d55ce7 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-vdec-check-if-parser-has-really-parser.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-vdec-check-if-parser-has-really-parser.patch @@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 6e0500bb807d..43a489162035 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -299,6 +299,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) diff --git a/patch/kernel/archive/meson64-6.6/general-meson-vdec-improve-mmu-and-fbc-handling-.patch b/patch/kernel/archive/meson64-6.6/general-meson-vdec-improve-mmu-and-fbc-handling-.patch index 08cf3298b..eb8879091 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson-vdec-improve-mmu-and-fbc-handling-.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson-vdec-improve-mmu-and-fbc-handling-.patch @@ -17,7 +17,7 @@ Unknown patch. From LibreELEC? 8 files changed, 163 insertions(+), 101 deletions(-) diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c -index c61128fc4bb9..d53c9a464bde 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/codec_h264.c +++ b/drivers/staging/media/meson/vdec/codec_h264.c @@ -353,7 +353,8 @@ static void codec_h264_src_change(struct amvdec_session *sess) @@ -31,7 +31,7 @@ index c61128fc4bb9..d53c9a464bde 100644 /* diff --git a/drivers/staging/media/meson/vdec/codec_hevc_common.c b/drivers/staging/media/meson/vdec/codec_hevc_common.c -index 0315cc0911cd..d6ed82dc93ca 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/codec_hevc_common.c +++ b/drivers/staging/media/meson/vdec/codec_hevc_common.c @@ -30,8 +30,11 @@ const u16 vdec_hevc_parser_cmd[] = { @@ -325,7 +325,7 @@ index 0315cc0911cd..d6ed82dc93ca 100644 mmu_map[i] = first_page + i; } diff --git a/drivers/staging/media/meson/vdec/codec_hevc_common.h b/drivers/staging/media/meson/vdec/codec_hevc_common.h -index cf072b8a9da2..13f9f1d90a94 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/codec_hevc_common.h +++ b/drivers/staging/media/meson/vdec/codec_hevc_common.h @@ -64,6 +64,7 @@ int codec_hevc_setup_buffers(struct amvdec_session *sess, @@ -338,7 +338,7 @@ index cf072b8a9da2..13f9f1d90a94 100644 #endif diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c -index 394df5761556..c2fec7a89fea 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/codec_vp9.c +++ b/drivers/staging/media/meson/vdec/codec_vp9.c @@ -458,12 +458,6 @@ struct codec_vp9 { @@ -430,7 +430,7 @@ index 394df5761556..c2fec7a89fea 100644 /* No frame is actually processed */ vp9->cur_frame = NULL; diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 43a489162035..96e14cdaf863 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -319,6 +319,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) @@ -442,7 +442,7 @@ index 43a489162035..96e14cdaf863 100644 return -EAGAIN; } diff --git a/drivers/staging/media/meson/vdec/vdec.h b/drivers/staging/media/meson/vdec/vdec.h -index 0906b8fb5cc6..a48170fe4cff 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec.h +++ b/drivers/staging/media/meson/vdec/vdec.h @@ -244,6 +244,7 @@ struct amvdec_session { @@ -454,7 +454,7 @@ index 0906b8fb5cc6..a48170fe4cff 100644 u8 quantization; u8 xfer_func; diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c -index 7d2a75653250..d684057509bf 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec_helpers.c +++ b/drivers/staging/media/meson/vdec/vdec_helpers.c @@ -50,32 +50,40 @@ void amvdec_write_parser(struct amvdec_core *core, u32 reg, u32 val) @@ -553,7 +553,7 @@ index 7d2a75653250..d684057509bf 100644 } EXPORT_SYMBOL_GPL(amvdec_src_change); diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.h b/drivers/staging/media/meson/vdec/vdec_helpers.h -index 4bf3e61d081b..1a711679d26a 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec_helpers.h +++ b/drivers/staging/media/meson/vdec/vdec_helpers.h @@ -27,9 +27,10 @@ void amvdec_clear_dos_bits(struct amvdec_core *core, u32 reg, u32 val); diff --git a/patch/kernel/archive/meson64-6.6/general-meson64-overlays.patch b/patch/kernel/archive/meson64-6.6/general-meson64-overlays.patch index cfe89608b..766584811 100644 --- a/patch/kernel/archive/meson64-6.6/general-meson64-overlays.patch +++ b/patch/kernel/archive/meson64-6.6/general-meson64-overlays.patch @@ -9,7 +9,7 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> 1 file changed, 3 insertions(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 9ea801a22569..d68118f6ec48 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, diff --git a/patch/kernel/archive/meson64-6.6/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch b/patch/kernel/archive/meson64-6.6/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch index a6f917d00..7163757df 100644 --- a/patch/kernel/archive/meson64-6.6/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch +++ b/patch/kernel/archive/meson64-6.6/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch @@ -10,7 +10,7 @@ Unknown patch. Archeology revelated nothing. Good luck... 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c -index 70322fab34ac..690ad0ddc31c 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -77,7 +77,8 @@ static irqreturn_t meson_ir_irq(int irqno, void *dev_id) diff --git a/patch/kernel/archive/meson64-6.6/general-si2168-fix-cmd-timeout.patch b/patch/kernel/archive/meson64-6.6/general-si2168-fix-cmd-timeout.patch index 70b7e53e4..5712b3ac8 100644 --- a/patch/kernel/archive/meson64-6.6/general-si2168-fix-cmd-timeout.patch +++ b/patch/kernel/archive/meson64-6.6/general-si2168-fix-cmd-timeout.patch @@ -11,7 +11,7 @@ Details: https://github.com/CoreELEC/CoreELEC/pull/208 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c -index dae1f2153e8b..cd44523f46a8 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -40,7 +40,7 @@ static int si2168_cmd_execute(struct i2c_client *client, struct si2168_cmd *cmd) diff --git a/patch/kernel/archive/meson64-6.6/general-sound-soc-remove-mono-channel-as-it-curren.patch b/patch/kernel/archive/meson64-6.6/general-sound-soc-remove-mono-channel-as-it-curren.patch index 848e5cc6e..acc61fd7b 100644 --- a/patch/kernel/archive/meson64-6.6/general-sound-soc-remove-mono-channel-as-it-curren.patch +++ b/patch/kernel/archive/meson64-6.6/general-sound-soc-remove-mono-channel-as-it-curren.patch @@ -11,10 +11,10 @@ Signed-off-by: ckkim 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c -index 8c166a5f338c..89afec8b49f7 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/meson/axg-frddr.c +++ b/sound/soc/meson/axg-frddr.c -@@ -107,7 +107,7 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = { +@@ -108,7 +108,7 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = { .name = "FRDDR", .playback = { .stream_name = "Playback", @@ -23,7 +23,7 @@ index 8c166a5f338c..89afec8b49f7 100644 .channels_max = AXG_FIFO_CH_MAX, .rates = AXG_FIFO_RATES, .formats = AXG_FIFO_FORMATS, -@@ -182,7 +182,7 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = { +@@ -183,7 +183,7 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = { .name = "FRDDR", .playback = { .stream_name = "Playback", diff --git a/patch/kernel/archive/meson64-6.6/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.6/general-spi-nor-add-support-for-XT25F128B.patch index 407dabd2c..d4711830c 100644 --- a/patch/kernel/archive/meson64-6.6/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.6/general-spi-nor-add-support-for-XT25F128B.patch @@ -29,7 +29,7 @@ in the core.{c,h} files. 4 files changed, 20 insertions(+) diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile -index e347b435a038..8992c592a896 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile @@ -17,6 +17,7 @@ spi-nor-objs += sst.o @@ -41,7 +41,7 @@ index e347b435a038..8992c592a896 100644 obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index 1b0c6770c14e..0cd1b57ecfcd 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { @@ -53,7 +53,7 @@ index 1b0c6770c14e..0cd1b57ecfcd 100644 static const struct flash_info spi_nor_generic_flash = { diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h -index 9217379b9cfe..28b90256425a 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -647,6 +647,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; @@ -66,7 +66,7 @@ index 9217379b9cfe..28b90256425a 100644 diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c new file mode 100644 -index 000000000000..900f2ac146a3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/mtd/spi-nor/xtx.c @@ -0,0 +1,17 @@ diff --git a/patch/kernel/archive/meson64-6.6/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.6/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 6fbf4bb50..e4bbf90c4 100644 --- a/patch/kernel/archive/meson64-6.6/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.6/general-usb-core-improve-handling-of-hubs-with-no-ports.patch @@ -33,10 +33,10 @@ Signed-off-by: Heiner Kallweit 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index fd94382c3fcc..52f776430d32 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1458,9 +1458,8 @@ static int hub_configure(struct usb_hub *hub, +@@ -1446,9 +1446,8 @@ static int hub_configure(struct usb_hub *hub, ret = -ENODEV; goto fail; } else if (hub->descriptor->bNbrPorts == 0) { diff --git a/patch/kernel/archive/meson64-6.6/hwmon-emc2305-fixups-for-driver.patch b/patch/kernel/archive/meson64-6.6/hwmon-emc2305-fixups-for-driver.patch index c2ed4fd36..924b3feb5 100644 --- a/patch/kernel/archive/meson64-6.6/hwmon-emc2305-fixups-for-driver.patch +++ b/patch/kernel/archive/meson64-6.6/hwmon-emc2305-fixups-for-driver.patch @@ -21,7 +21,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 88 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c -index 29f0e4945f19..2581166cb978 100644 +index 111111111111..222222222222 100644 --- a/drivers/hwmon/emc2305.c +++ b/drivers/hwmon/emc2305.c @@ -15,12 +15,13 @@ diff --git a/patch/kernel/archive/meson64-6.6/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch b/patch/kernel/archive/meson64-6.6/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch index 9a0b10eca..d6c0036fa 100644 --- a/patch/kernel/archive/meson64-6.6/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch +++ b/patch/kernel/archive/meson64-6.6/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch @@ -11,7 +11,7 @@ Signed-off-by: Vyacheslav Bocharov 2 files changed, 42 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c -index 524424ee6c4e..77b9222a53c8 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -51,6 +51,7 @@ @@ -84,7 +84,7 @@ index 524424ee6c4e..77b9222a53c8 100644 if (IS_ERR_OR_NULL(pc->reg_mux)) { dev_err(pc->dev, "mux registers not found\n"); diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h -index 34fc4e8612e4..0f9fa04513ea 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -134,6 +134,7 @@ struct meson_pinctrl { diff --git a/patch/kernel/archive/meson64-6.6/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch b/patch/kernel/archive/meson64-6.6/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch index bb330c900..60c8bcd5a 100644 --- a/patch/kernel/archive/meson64-6.6/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch +++ b/patch/kernel/archive/meson64-6.6/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch @@ -1,16 +1,16 @@ -From b2551c258d19c06a8d946338a7f79395f12870c4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Fri, 20 Oct 2023 14:06:58 +0300 -Subject: [PATCH] arm64: dts: jethub-j1xx: add eeprom node +Subject: arm64: dts: jethub-j1xx: add eeprom node Add node for eeprom on baseboard in JetHub D1+ device --- - .../amlogic/meson-axg-jethome-jethub-j110-rev-2.dts | 12 ++++++++++++ - .../amlogic/meson-axg-jethome-jethub-j110-rev-3.dts | 12 ++++++++++++ + arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts | 12 ++++++++++ + arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts | 12 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts -index 0062667c4f65..140c724c57fb 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts @@ -35,3 +35,15 @@ bluetooth { @@ -30,7 +30,7 @@ index 0062667c4f65..140c724c57fb 100644 + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts -index c2d22b00c1cd..6a5664d908d5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts @@ -25,3 +25,15 @@ memory@0 { @@ -50,5 +50,5 @@ index c2d22b00c1cd..6a5664d908d5 100644 + }; +}; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson64-6.6/meson-g12a-pinctrl-add-missing-ir-options.patch b/patch/kernel/archive/meson64-6.6/meson-g12a-pinctrl-add-missing-ir-options.patch index 4e1426a3c..9a321bac0 100644 --- a/patch/kernel/archive/meson64-6.6/meson-g12a-pinctrl-add-missing-ir-options.patch +++ b/patch/kernel/archive/meson64-6.6/meson-g12a-pinctrl-add-missing-ir-options.patch @@ -12,10 +12,10 @@ Signed-off-by: Yuntian Zhang 2 files changed, 25 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index abc0483ff3b4..64ca8767cb83 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -563,6 +563,14 @@ mux { +@@ -568,6 +568,14 @@ mux { }; }; @@ -30,7 +30,7 @@ index abc0483ff3b4..64ca8767cb83 100644 mclk0_a_pins: mclk0-a { mux { groups = "mclk0_a"; -@@ -2015,6 +2023,14 @@ mux { +@@ -2020,6 +2028,14 @@ mux { bias-disable; }; }; @@ -46,7 +46,7 @@ index abc0483ff3b4..64ca8767cb83 100644 }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c -index 2c17891ba6a9..e80a5897d9f2 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -216,6 +216,9 @@ static const unsigned int i2c3_sck_h_pins[] = { GPIOH_1 }; diff --git a/patch/kernel/archive/meson64-6.6/meson-g12a-radxa-zero-gpio-pin-names.patch b/patch/kernel/archive/meson64-6.6/meson-g12a-radxa-zero-gpio-pin-names.patch index c38751c77..fec96f938 100644 --- a/patch/kernel/archive/meson64-6.6/meson-g12a-radxa-zero-gpio-pin-names.patch +++ b/patch/kernel/archive/meson64-6.6/meson-g12a-radxa-zero-gpio-pin-names.patch @@ -1,11 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Sergey Ko +Date: Wed, 11 Dec 2024 14:06:34 -0600 +Subject: [ARCHEOLOGY] add Radxa Zero GPIO names to support libgpiod (#7563) + +> X-Git-Archeology: - Revision fb63c78e7f05f18013d7c0c54d3935018761968f: https://github.com/armbian/build/commit/fb63c78e7f05f18013d7c0c54d3935018761968f +> X-Git-Archeology: Date: Wed, 11 Dec 2024 14:06:34 -0600 +> X-Git-Archeology: From: Sergey Ko +> X-Git-Archeology: Subject: add Radxa Zero GPIO names to support libgpiod (#7563) +> X-Git-Archeology: +--- + arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 26 ++++++++++ + 1 file changed, 26 insertions(+) + diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index c779a5da7d1e..cb1a167c117c 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -262,6 +262,32 @@ &frddr_c { +@@ -290,6 +290,32 @@ &frddr_c { status = "okay"; }; - + +/* +pin-8, pin-36 are mapped referring to: /include/dt-bindings/gpio/meson-g12a-gpio.h +left as is for future tests @@ -35,3 +49,6 @@ index c779a5da7d1e..cb1a167c117c 100644 &hdmi_tx { status = "okay"; pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; +-- +Armbian + diff --git a/patch/kernel/archive/meson64-6.6/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch b/patch/kernel/archive/meson64-6.6/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch index 3ae8275a8..f929f37d3 100644 --- a/patch/kernel/archive/meson64-6.6/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch +++ b/patch/kernel/archive/meson64-6.6/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch @@ -16,7 +16,7 @@ Signed-off-by: Yuntian Zhang 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi -index 86e6ceb31d5e..256416943fa0 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -149,3 +149,37 @@ &pmu { @@ -58,7 +58,7 @@ index 86e6ceb31d5e..256416943fa0 100644 + }; +}; diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c -index e80a5897d9f2..086310a998e0 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -271,17 +271,21 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 }; diff --git a/patch/kernel/archive/meson64-6.6/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch b/patch/kernel/archive/meson64-6.6/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch index fdc398a11..21d766775 100644 --- a/patch/kernel/archive/meson64-6.6/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch +++ b/patch/kernel/archive/meson64-6.6/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch @@ -9,7 +9,7 @@ Signed-off-by: Neil Armstrong 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 2673f0dbafe7..81ac2bff38fe 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -223,6 +223,10 @@ sm: secure-monitor { diff --git a/patch/kernel/archive/meson64-6.6/meson-gxbb-dts-i2cX-missing-pins.patch b/patch/kernel/archive/meson64-6.6/meson-gxbb-dts-i2cX-missing-pins.patch index 4830f28d6..f73c17ed0 100644 --- a/patch/kernel/archive/meson64-6.6/meson-gxbb-dts-i2cX-missing-pins.patch +++ b/patch/kernel/archive/meson64-6.6/meson-gxbb-dts-i2cX-missing-pins.patch @@ -9,10 +9,10 @@ Subject: fix i2cA and i2cB miossing pins 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index 12ef6e81c8bd..90ae81493de2 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -@@ -333,6 +333,8 @@ &hwrng { +@@ -339,6 +339,8 @@ &hwrng { &i2c_A { clocks = <&clkc CLKID_I2C>; @@ -21,7 +21,7 @@ index 12ef6e81c8bd..90ae81493de2 100644 }; &i2c_AO { -@@ -341,6 +343,8 @@ &i2c_AO { +@@ -347,6 +349,8 @@ &i2c_AO { &i2c_B { clocks = <&clkc CLKID_I2C>; diff --git a/patch/kernel/archive/meson64-6.6/meson-gxbb-vdec-add-HEVC-support-to-GXBB.patch b/patch/kernel/archive/meson64-6.6/meson-gxbb-vdec-add-HEVC-support-to-GXBB.patch index ab899460c..4d0717675 100644 --- a/patch/kernel/archive/meson64-6.6/meson-gxbb-vdec-add-HEVC-support-to-GXBB.patch +++ b/patch/kernel/archive/meson64-6.6/meson-gxbb-vdec-add-HEVC-support-to-GXBB.patch @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 12 insertions(+) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index 04ed5c2d6fd9..c2ac6010992e 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -16,6 +16,18 @@ diff --git a/patch/kernel/archive/meson64-6.6/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/patch/kernel/archive/meson64-6.6/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index 772db467f..b0ff25df9 100644 --- a/patch/kernel/archive/meson64-6.6/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/patch/kernel/archive/meson64-6.6/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -87,7 +87,7 @@ Signed-off-by: Christian Hewitt 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index 18f7b730289e..59f7b51598b5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -257,7 +257,11 @@ &sd_emmc_a { @@ -104,7 +104,7 @@ index 18f7b730289e..59f7b51598b5 100644 non-removable; disable-wp; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index a150cc0e18ff..6eec4e81592b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -121,7 +121,11 @@ &sd_emmc_a { diff --git a/patch/kernel/archive/meson64-6.6/meson-gxm-vdec-add-VP9-support-to-GXM.patch b/patch/kernel/archive/meson64-6.6/meson-gxm-vdec-add-VP9-support-to-GXM.patch index a76b24a59..ec4275418 100644 --- a/patch/kernel/archive/meson64-6.6/meson-gxm-vdec-add-VP9-support-to-GXM.patch +++ b/patch/kernel/archive/meson64-6.6/meson-gxm-vdec-add-VP9-support-to-GXM.patch @@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index c2ac6010992e..ac5cfaf66493 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -27,7 +27,19 @@ static const struct amvdec_format vdec_formats_gxbb[] = { diff --git a/patch/kernel/archive/meson64-6.6/meson-sm1-dts-add-higher-clocks.patch b/patch/kernel/archive/meson64-6.6/meson-sm1-dts-add-higher-clocks.patch index b1756d8d1..fd5af09cf 100644 --- a/patch/kernel/archive/meson64-6.6/meson-sm1-dts-add-higher-clocks.patch +++ b/patch/kernel/archive/meson64-6.6/meson-sm1-dts-add-higher-clocks.patch @@ -9,7 +9,7 @@ Signed-off-by: Igor Pecovnik 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -index 643f94d9d08e..c0fe046216fc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -136,6 +136,16 @@ opp-1908000000 {