kirkwood: kernel: refresh 6.1 patches
authorPawel Dembicki <paweldembicki@gmail.com>
Tue, 14 Nov 2023 10:16:40 +0000 (11:16 +0100)
committerChristian Lamparter <chunkeey@gmail.com>
Tue, 12 Dec 2023 18:35:03 +0000 (19:35 +0100)
Kernel patches copied from 5.15 need to be refreshed.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch
target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch
target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch

index b745ea104fd5e5ac2e9f14ed525b454bc13cbc09..09e71813cdb36e8593f3404f82e0484c93722730 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
 
 --- 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 \
index 4b0f46bb6dd5471ca1a82aeca6fd2b3c8c735889..cde281526be70a039c9e8c8cf1b0dac1783893c9 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
 
 --- 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) += \
index 35db065727154cbc0fb2f1637cc033fcebe8dcd4..3db362de9fbda2e697df436e89c46537dade28ca 100644 (file)
@@ -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