From 2eef4f7354729ba731d6528c4662f8c6c20a5e95 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 15 May 2024 23:16:54 +0200 Subject: [PATCH] ixp4xx: Bump to kernel v6.6 The IXP4xx is well supported upstream and can readily be supported with kernel v6.6. To simplify things after the DTS directory was renamed, switch to v6.6 only. Bring in some outstanding patches. Tested on the Gateworks GW2348-4. Signed-off-by: Linus Walleij --- package/kernel/linux/modules/crypto.mk | 2 +- target/linux/ixp4xx/Makefile | 2 +- .../linux/ixp4xx/{config-6.1 => config-6.6} | 38 +++++++----- target/linux/ixp4xx/image/Makefile | 1 + ...andle-clock-output-on-pin-14-and-15.patch} | 4 +- ...ixp4xx_eth-Support-changing-the-MTU.patch} | 0 ...-Add-USRobotics-USR8200-device-tree.patch} | 26 ++++---- ...4-ARM-dts-usr8200-Fix-phy-registers.patch} | 12 ++-- ...s-ixp4xx-nslu2-Enable-write-on-flash.patch | 25 ++++++++ ...dts-ixp4xx-Use-right-restart-keycode.patch | 62 +++++++++++++++++++ ...dts-ixp4xx-Boot-NSLU2-from-harddrive.patch | 8 +-- 11 files changed, 140 insertions(+), 40 deletions(-) rename target/linux/ixp4xx/{config-6.1 => config-6.6} (90%) rename target/linux/ixp4xx/{patches-6.1/0002-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch => patches-6.6/0001-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch} (96%) rename target/linux/ixp4xx/{patches-6.1/0005-net-ixp4xx_eth-Support-changing-the-MTU.patch => patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch} (100%) rename target/linux/ixp4xx/{patches-6.1/0004-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch => patches-6.6/0003-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch} (89%) rename target/linux/ixp4xx/{patches-6.1/0008-ARM-dts-usr8200-Fix-phy-registers.patch => patches-6.6/0004-ARM-dts-usr8200-Fix-phy-registers.patch} (74%) create mode 100644 target/linux/ixp4xx/patches-6.6/0005-ARM-dts-ixp4xx-nslu2-Enable-write-on-flash.patch create mode 100644 target/linux/ixp4xx/patches-6.6/0006-ARM-dts-ixp4xx-Use-right-restart-keycode.patch rename target/linux/ixp4xx/{patches-6.1 => patches-6.6}/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch (69%) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 4a8a283d37..638182d712 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -411,7 +411,7 @@ define KernelPackage/crypto-hw-ixp4xx KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_IXP4XX - FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko + FILES:=$(LINUX_DIR)/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.ko AUTOLOAD:=$(call AutoProbe,ixp4xx_crypto) $(call AddDepends/crypto) endef diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index f089687da9..33f7c579ea 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -11,7 +11,7 @@ FEATURES:=dt squashfs gpio CPU_TYPE:=xscale SUBTARGETS:=generic -KERNEL_PATCHVER:=6.1 +KERNEL_PATCHVER:=6.6 define Target/Description Build firmware images for the IXP4xx XScale CPU diff --git a/target/linux/ixp4xx/config-6.1 b/target/linux/ixp4xx/config-6.6 similarity index 90% rename from target/linux/ixp4xx/config-6.1 rename to target/linux/ixp4xx/config-6.6 index 4c4aa11969..960012ada4 100644 --- a/target/linux/ixp4xx/config-6.1 +++ b/target/linux/ixp4xx/config-6.6 @@ -11,10 +11,10 @@ CONFIG_ARCH_MULTI_CPU_AUTO=y # CONFIG_ARCH_MULTI_V4T is not set CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_MULTI_V5=y -CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM=y CONFIG_ARM_APPENDED_DTB=y @@ -30,6 +30,7 @@ CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y +CONFIG_BUFFER_HEAD=y CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_CC_NO_ARRAY_BOUNDS=y @@ -45,6 +46,7 @@ CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_CP15=y CONFIG_CPU_CP15_MMU=y CONFIG_CPU_ENDIAN_BE32=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V4WBI=y @@ -60,9 +62,9 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_DES=m +CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_UTILS=y -CONFIG_CRYPTO_RNG2=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" @@ -82,10 +84,12 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_FORCE_PCI=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y +CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y @@ -108,13 +112,14 @@ CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GW_PLD=y CONFIG_GPIO_IXP4XX=y +CONFIG_GRO_CELLS=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HDLC=y CONFIG_HWMON=y -CONFIG_HWMON_VID=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_IXP4XX=y CONFIG_HZ_FIXED=0 @@ -150,9 +155,9 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVRES=y -CONFIG_MEMFD_CREATE=y CONFIG_MFD_SYSCON=y CONFIG_MIGRATION=y +CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_CFI_ADV_OPTIONS=y # CONFIG_MTD_CFI_GEOMETRY is not set @@ -165,13 +170,20 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="linux" CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_KUSER_HELPERS=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6060=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_EGRESS=y +CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y +CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_XSCALE=y +CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NVMEM=y +CONFIG_NVMEM_LAYOUTS=y CONFIG_NVMEM_SYSFS=y CONFIG_OF=y CONFIG_OF_ADDRESS=y @@ -181,12 +193,13 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y -# CONFIG_OLD_SIGACTION is not set -# CONFIG_OLD_SIGSUSPEND3 is not set +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y CONFIG_PATA_IXP4XX_CF=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y @@ -195,6 +208,8 @@ CONFIG_PCI_IXP4XX=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y +CONFIG_PHYLIB_LEDS=y +CONFIG_PHYLINK=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_PREEMPT_NONE_BUILD=y @@ -203,22 +218,17 @@ CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y CONFIG_REALTEK_PHY=y CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y -CONFIG_RUST_IS_AVAILABLE=y CONFIG_SCSI=y CONFIG_SCSI_COMMON=y -# CONFIG_SERIAL_8250_EXAR is not set -# CONFIG_SERIAL_8250_FSL is not set -# CONFIG_SERIAL_8250_PCI is not set -# CONFIG_SERIAL_8250_PERICOM is not set +CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SG_POOL=y CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_SPARSE_IRQ=y CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SRCU=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SWPHY=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile index c6d4817c96..b532bcd914 100644 --- a/target/linux/ixp4xx/image/Makefile +++ b/target/linux/ixp4xx/image/Makefile @@ -29,6 +29,7 @@ endef define Device/Default PROFILES := Default + DEVICE_DTS_DIR = $$(DTS_DIR)/intel/ixp KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb diff --git a/target/linux/ixp4xx/patches-6.1/0002-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch b/target/linux/ixp4xx/patches-6.6/0001-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch similarity index 96% rename from target/linux/ixp4xx/patches-6.1/0002-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch rename to target/linux/ixp4xx/patches-6.6/0001-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch index 38adecd64f..0498edcd1b 100644 --- a/target/linux/ixp4xx/patches-6.1/0002-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch +++ b/target/linux/ixp4xx/patches-6.6/0001-gpio-ixp4xx-Handle-clock-output-on-pin-14-and-15.patch @@ -40,7 +40,7 @@ Signed-off-by: Linus Walleij /** * struct ixp4xx_gpio - IXP4 GPIO state container * @dev: containing device for this instance -@@ -203,6 +215,8 @@ static int ixp4xx_gpio_probe(struct plat +@@ -202,6 +214,8 @@ static int ixp4xx_gpio_probe(struct plat struct ixp4xx_gpio *g; struct gpio_irq_chip *girq; struct device_node *irq_parent; @@ -49,7 +49,7 @@ Signed-off-by: Linus Walleij int ret; g = devm_kzalloc(dev, sizeof(*g), GFP_KERNEL); -@@ -233,7 +247,40 @@ static int ixp4xx_gpio_probe(struct plat +@@ -231,7 +245,40 @@ static int ixp4xx_gpio_probe(struct plat */ if (of_machine_is_compatible("dlink,dsm-g600-a") || of_machine_is_compatible("iom,nas-100d")) diff --git a/target/linux/ixp4xx/patches-6.1/0005-net-ixp4xx_eth-Support-changing-the-MTU.patch b/target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch similarity index 100% rename from target/linux/ixp4xx/patches-6.1/0005-net-ixp4xx_eth-Support-changing-the-MTU.patch rename to target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch diff --git a/target/linux/ixp4xx/patches-6.1/0004-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch b/target/linux/ixp4xx/patches-6.6/0003-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch similarity index 89% rename from target/linux/ixp4xx/patches-6.1/0004-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch rename to target/linux/ixp4xx/patches-6.6/0003-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch index 0ae80d170e..93b12a5381 100644 --- a/target/linux/ixp4xx/patches-6.1/0004-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch +++ b/target/linux/ixp4xx/patches-6.6/0003-ARM-dts-ixp4xx-Add-USRobotics-USR8200-device-tree.patch @@ -1,33 +1,33 @@ -From 02693ffdb93bffcbe772bd91a399dabd123b8c19 Mon Sep 17 00:00:00 2001 +From a1490c1e8a12a8286c6a34c3d277a519066fc51e Mon Sep 17 00:00:00 2001 From: Linus Walleij -Date: Tue, 19 Sep 2023 16:02:15 +0200 -Subject: [PATCH 4/4] ARM: dts: ixp4xx: Add USRobotics USR8200 device tree +Date: Sat, 7 Oct 2023 14:32:40 +0200 +Subject: [PATCH] ARM: dts: ixp4xx: Add USRobotics USR8200 device tree This is a USRobotics NAS/Firewall/router that has been supported by OpenWrt in the past. It had dedicated users so let's get it properly supported. +Some debugging and fixing was provided by Howard Harte. + +Link: https://lore.kernel.org/r/20231007-ixp4xx-usr8200-v1-1-aded3d6ff6f1@linaro.org Signed-off-by: Linus Walleij --- - arch/arm/boot/dts/Makefile | 3 +- - .../dts/intel-ixp42x-usrobotics-usr8200.dts | 229 ++++++++++++++++++ + arch/arm/boot/dts/intel/ixp/Makefile | 3 +- + .../ixp/intel-ixp42x-usrobotics-usr8200.dts | 229 ++++++++++++++++++ 2 files changed, 231 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/intel-ixp42x-usrobotics-usr8200.dts + create mode 100644 arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -292,7 +292,8 @@ dtb-$(CONFIG_ARCH_IXP4XX) += \ +--- a/arch/arm/boot/dts/intel/ixp/Makefile ++++ b/arch/arm/boot/dts/intel/ixp/Makefile +@@ -16,4 +16,5 @@ dtb-$(CONFIG_ARCH_IXP4XX) += \ intel-ixp43x-gateworks-gw2358.dtb \ intel-ixp42x-netgear-wg302v1.dtb \ intel-ixp42x-arcom-vulcan.dtb \ - intel-ixp42x-gateway-7001.dtb + intel-ixp42x-gateway-7001.dtb \ + intel-ixp42x-usrobotics-usr8200.dtb - dtb-$(CONFIG_ARCH_KEYSTONE) += \ - keystone-k2hk-evm.dtb \ - keystone-k2l-evm.dtb \ --- /dev/null -+++ b/arch/arm/boot/dts/intel-ixp42x-usrobotics-usr8200.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts @@ -0,0 +1,229 @@ +// SPDX-License-Identifier: ISC +/* diff --git a/target/linux/ixp4xx/patches-6.1/0008-ARM-dts-usr8200-Fix-phy-registers.patch b/target/linux/ixp4xx/patches-6.6/0004-ARM-dts-usr8200-Fix-phy-registers.patch similarity index 74% rename from target/linux/ixp4xx/patches-6.1/0008-ARM-dts-usr8200-Fix-phy-registers.patch rename to target/linux/ixp4xx/patches-6.6/0004-ARM-dts-usr8200-Fix-phy-registers.patch index bf056b89a9..93458bc2e8 100644 --- a/target/linux/ixp4xx/patches-6.1/0008-ARM-dts-usr8200-Fix-phy-registers.patch +++ b/target/linux/ixp4xx/patches-6.6/0004-ARM-dts-usr8200-Fix-phy-registers.patch @@ -1,6 +1,6 @@ -From a1ab45966e5a21841af58742adf27725e523d303 Mon Sep 17 00:00:00 2001 +From 98f3b5f44b9ae86c4a80185b57149867472a2570 Mon Sep 17 00:00:00 2001 From: Linus Walleij -Date: Sat, 14 Oct 2023 19:53:24 +0200 +Date: Fri, 20 Oct 2023 15:11:41 +0200 Subject: [PATCH] ARM: dts: usr8200: Fix phy registers The MV88E6060 switch has internal PHY registers at MDIO @@ -8,12 +8,14 @@ addresses 0x00..0x04. Tie each port to the corresponding PHY. Signed-off-by: Linus Walleij +Link: https://lore.kernel.org/r/20231020-ixp4xx-usr8200-dtsfix-v1-1-3a8591dea259@linaro.org +Signed-off-by: Arnd Bergmann --- - .../dts/intel-ixp42x-usrobotics-usr8200.dts | 22 +++++++++++++++++++ + .../ixp/intel-ixp42x-usrobotics-usr8200.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) ---- a/arch/arm/boot/dts/intel-ixp42x-usrobotics-usr8200.dts -+++ b/arch/arm/boot/dts/intel-ixp42x-usrobotics-usr8200.dts +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts @@ -165,6 +165,24 @@ #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ixp4xx/patches-6.6/0005-ARM-dts-ixp4xx-nslu2-Enable-write-on-flash.patch b/target/linux/ixp4xx/patches-6.6/0005-ARM-dts-ixp4xx-nslu2-Enable-write-on-flash.patch new file mode 100644 index 0000000000..ccbd7ea77d --- /dev/null +++ b/target/linux/ixp4xx/patches-6.6/0005-ARM-dts-ixp4xx-nslu2-Enable-write-on-flash.patch @@ -0,0 +1,25 @@ +From 89eccb6726d93c9c78997e91bd641b0e46bc3c5f Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Fri, 8 Sep 2023 12:49:48 +0200 +Subject: [PATCH] ARM: dts: ixp4xx-nslu2: Enable write on flash + +To upgrade the firmware and similar, the flash needs write +access. + +Link: https://lore.kernel.org/r/20230908-ixp4xx-dts-v1-1-98d36264ed6d@linaro.org +Signed-off-by: Linus Walleij +--- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts +@@ -101,6 +101,8 @@ + flash@0,0 { + compatible = "intel,ixp4xx-flash", "cfi-flash"; + bank-width = <2>; ++ /* Enable writes on the expansion bus */ ++ intel,ixp4xx-eb-write-enable = <1>; + /* + * 8 MB of Flash in 0x20000 byte blocks + * mapped in at CS0. diff --git a/target/linux/ixp4xx/patches-6.6/0006-ARM-dts-ixp4xx-Use-right-restart-keycode.patch b/target/linux/ixp4xx/patches-6.6/0006-ARM-dts-ixp4xx-Use-right-restart-keycode.patch new file mode 100644 index 0000000000..648c6efe2b --- /dev/null +++ b/target/linux/ixp4xx/patches-6.6/0006-ARM-dts-ixp4xx-Use-right-restart-keycode.patch @@ -0,0 +1,62 @@ +From deb93908958e74dffbef1ce6a1cc2f82ac4f96ed Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Fri, 8 Sep 2023 12:49:49 +0200 +Subject: [PATCH] ARM: dts: ixp4xx: Use right restart keycode + +The "reset" key on a few IXP4xx routers were sending KEY_ESC +but what we want to send is KEY_RESTART which will make +OpenWrt and similar userspace do a controlled reboot. + +Link: https://lore.kernel.org/r/20230908-ixp4xx-dts-v1-2-98d36264ed6d@linaro.org +Signed-off-by: Linus Walleij +--- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-dlink-dsm-g600.dts | 2 +- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-freecom-fsg-3.dts | 2 +- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-iomega-nas100d.dts | 2 +- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-dlink-dsm-g600.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-dlink-dsm-g600.dts +@@ -57,7 +57,7 @@ + + button-reset { + wakeup-source; +- linux,code = ; ++ linux,code = ; + label = "reset"; + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + }; +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-freecom-fsg-3.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-freecom-fsg-3.dts +@@ -44,7 +44,7 @@ + }; + button-reset { + wakeup-source; +- linux,code = ; ++ linux,code = ; + label = "reset"; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + }; +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-iomega-nas100d.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-iomega-nas100d.dts +@@ -63,7 +63,7 @@ + }; + button-reset { + wakeup-source; +- linux,code = ; ++ linux,code = ; + label = "reset"; + gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + }; +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts +@@ -65,7 +65,7 @@ + }; + button-reset { + wakeup-source; +- linux,code = ; ++ linux,code = ; + label = "reset"; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + }; diff --git a/target/linux/ixp4xx/patches-6.1/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch b/target/linux/ixp4xx/patches-6.6/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch similarity index 69% rename from target/linux/ixp4xx/patches-6.1/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch rename to target/linux/ixp4xx/patches-6.6/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch index ffd69a774c..2a82ec0a2d 100644 --- a/target/linux/ixp4xx/patches-6.1/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch +++ b/target/linux/ixp4xx/patches-6.6/301-ARM-dts-ixp4xx-Boot-NSLU2-from-harddrive.patch @@ -1,4 +1,4 @@ -From 2792791a19f90b0141ed2e781599ba0a42a8cfd5 Mon Sep 17 00:00:00 2001 +From 6484f966af53447deefcd4b805c201d8624981cb Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 29 May 2023 23:32:44 +0200 Subject: [PATCH] ARM: dts: ixp4xx: Boot NSLU2 from harddrive @@ -8,11 +8,11 @@ to hold any rootfs these days. Signed-off-by: Linus Walleij --- - arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 2 +- + arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts -+++ b/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts +--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts ++++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts @@ -21,7 +21,7 @@ };