From c8550de0164655c53cf45a210c1f3f1eec591d6b Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Tue, 14 Nov 2023 11:16:40 +0100 Subject: [PATCH] kirkwood: kernel: refresh 6.1 patches Kernel patches copied from 5.15 need to be refreshed. Signed-off-by: Pawel Dembicki --- .../002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch | 2 +- .../003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch | 2 +- .../201-enable-sata-port-specific-led-triggers.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch b/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch index b745ea104f..09e71813cd 100644 --- a/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch +++ b/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch @@ -29,7 +29,7 @@ Signed-off-by: Gregory CLEMENT --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -320,6 +320,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ +@@ -356,6 +356,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-ns2mini.dtb \ kirkwood-nsa310.dtb \ kirkwood-nsa310a.dtb \ diff --git a/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch b/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch index 4b0f46bb6d..cde281526b 100644 --- a/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch +++ b/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch @@ -31,7 +31,7 @@ Signed-off-by: Gregory CLEMENT --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -265,6 +265,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ +@@ -300,6 +300,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ keystone-k2g-evm.dtb \ keystone-k2g-ice.dtb dtb-$(CONFIG_MACH_KIRKWOOD) += \ diff --git a/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch index 35db065727..3db362de9f 100644 --- a/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch +++ b/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig -@@ -116,6 +116,7 @@ config MACH_DOVE +@@ -115,6 +115,7 @@ config MACH_DOVE config MACH_KIRKWOOD bool "Marvell Kirkwood boards" depends on ARCH_MULTI_V5 -- 2.30.2