Merge branch 'openwrt:main' into main

include/package-pack.mk

@@ -344,7 +344,7 @@ else
 	  --info "name:$(1)$$(ABIV_$(1))" \
 	  --info "version:$(VERSION)" \
 	  --info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
-	  --info "arch:$(PKGARCH)" \
+	  $(if $(findstring all,$(PKGARCH)),--info "arch:noarch",--info "arch:$(PKGARCH)") \
 	  --info "license:$(LICENSE)" \
 	  --info "origin:$(SOURCE)" \
 	  --info "url:$(URL)" \
@@ -359,7 +359,7 @@ else
 			) \
 		), \
 		$$(prov) )" \
-	  $(if $(DEFAULT_VARIANT),--info "provider-priority:100") \
+	  $(if $(DEFAULT_VARIANT),--info "provider-priority:100",$(if $(PROVIDES),--info "provider-priority:1")) \
 	  --script "post-install:$$(ADIR_$(1))/post-install" \
 	  --script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall" \
 	  --info "depends:$$(foreach depends,$$(subst $$(comma),$$(space),$$(subst $$(space),,$$(subst $$(paren_right),,$$(subst $$(paren_left),,$$(Package/$(1)/DEPENDS))))),$$(depends))" \

package/network/ipv6/odhcp6c/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
-PKG_RELEASE:=20
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git
-PKG_SOURCE_DATE:=2023-05-12
-PKG_SOURCE_VERSION:=bcd283632ac13391aac3ebdd074d1fd832d76fa3
-PKG_MIRROR_HASH:=0c18c578045f9251bd86a5b8fb0518b69c519e83f69907bf76583a2985482508
+PKG_SOURCE_DATE:=2024-09-25
+PKG_SOURCE_VERSION:=b6ae9ffaeb0e18e9fa3d5be62faa8d3c9f340a58
+PKG_MIRROR_HASH:=25499b6a0d403815e6b04869a02d2d5a32582348bff2bc2626559d297425a908
 PKG_MAINTAINER:=Hans Dedecker <[email protected]>
 PKG_LICENSE:=GPL-2.0
 

package/system/apk/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apk
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2024-11-08
-PKG_SOURCE_VERSION:=d9c24813d983df9524fa7a2b78fc3132c159a20f
-PKG_MIRROR_HASH:=3d1a79c08ef8c8b9404f9287d9acda6468b8b1c2a99dd384287f522ed3b1a047
+PKG_SOURCE_DATE:=2024-11-13
+PKG_SOURCE_VERSION:=e3464d096708b270138653ef93db59134bb24813
+PKG_MIRROR_HASH:=cc633e5c294c9d92391fba5537dfe2f12f82011b55d282beb0d5d7ceba212962
 
 PKG_VERSION=3.0.0_pre$(subst -,,$(PKG_SOURCE_DATE))
 

package/utils/mtd-utils/Makefile

@@ -65,12 +65,20 @@ CONFIGURE_ARGS += \
 	--without-lzo \
 	--without-zlib
 
+define Package/ubi-utils/conffiles
+/etc/config/ubihealthd
+endef
+
 define Package/ubi-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubimkvol} $(1)/usr/sbin/
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubihealthd} $(1)/usr/sbin/
 	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/{ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubimkvol,ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/ubihealthd.init $(1)/etc/init.d/ubihealthd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/ubihealthd.defaults $(1)/etc/uci-defaults/ubihealthd
 endef
 
 define Package/nand-utils/install

package/utils/mtd-utils/files/ubihealthd.defaults

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+[ -e "/etc/config/ubihealthd" ] && exit 0
+[ ! -e "/sys/class/ubi" ] && exit 0
+
+touch  "/etc/config/ubihealthd"
+
+for ubidev in /sys/class/ubi/*/total_eraseblocks; do
+	ubidev="${ubidev%/*}"
+	ubidev="${ubidev##*/}"
+	uci batch <<EOF
+set ubihealthd.$ubidev=ubi-device
+set ubihealthd.$ubidev.device="/dev/$ubidev"
+set ubihealthd.$ubidev.enable=1
+EOF
+done
+
+uci commit ubihealthd

package/utils/mtd-utils/files/ubihealthd.init

@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+USE_PROCD=1
+PROG=/usr/sbin/ubihealthd
+
+ubihealthd_instance() {
+	local cfg="$1"
+	local device interval enable
+
+	config_get_bool enable "$cfg" "enable" 1
+	[ "$enable" = "1" ] || return 0
+
+	config_get device "$cfg" "device"
+	config_get interval "$cfg" "interval"
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -d "$device"
+	[ -n "$interval" ] && procd_append_param command -i "$interval"
+	procd_close_instance
+}
+
+start_service() {
+	config_load ubihealthd
+	config_foreach ubihealthd_instance ubi-device
+}

package/utils/omnia-eeprom/Makefile

@@ -29,7 +29,7 @@ define Package/omnia-eeprom
   CATEGORY:=Utilities
   URL:=https://gitlab.nic.cz/turris/omnia-eeprom
   TITLE:=CZ.NIC Turris Omnia EEPROM accessing utility
-  DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia +kmod-eeprom-at24
+  DEPENDS:=@TARGET_mvebu_cortexa9 +kmod-eeprom-at24
 endef
 
 define Package/omnia-eeprom/description

target/imagebuilder/files/Makefile

@@ -200,7 +200,7 @@ ifeq ($(CONFIG_USE_APK),)
 		$(OPKG) update >&2 || true; \
 	fi
 else
-	$(APK) add --initdb
+	$(APK) add --arch $(ARCH_PACKAGES) --initdb
 	if [ -d "$(PACKAGE_DIR)" ] && ( \
 			[ ! -f "$(PACKAGE_DIR)/packages.adb" ] || \
 			[ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/packages.adb`" ] ); then \
@@ -227,7 +227,7 @@ ifeq ($(CONFIG_USE_APK),)
 	$(OPKG) install $(wildcard $(PACKAGE_DIR)/kernel_*.ipk)
 	$(OPKG) install $(BUILD_PACKAGES)
 else
-	$(APK) add --no-scripts $(BUILD_PACKAGES)
+	$(APK) add --arch $(ARCH_PACKAGES) --no-scripts $(BUILD_PACKAGES)
 endif
 
 prepare_rootfs: FORCE

target/linux/airoha/patches-6.6/103-watchdog-Add-support-for-Airoha-EN7851-watchdog.patch → target/linux/airoha/patches-6.6/032-v6.13-watchdog-Add-support-for-Airoha-EN7851-watchdog.patch

@@ -1,19 +1,18 @@
-From 4019d58ca5b249e4cf79169cc0c6a4ff5275c155 Mon Sep 17 00:00:00 2001
+From 3cf67f3769b8227ca75ca7102180a2e270ee01aa Mon Sep 17 00:00:00 2001
 From: Christian Marangi <[email protected]>
-Date: Fri, 5 Jul 2024 19:12:12 +0200
-Subject: [PATCH v2 2/2] watchdog: Add support for Airoha EN7851 watchdog
+Date: Fri, 11 Oct 2024 12:43:53 +0200
+Subject: [PATCH] watchdog: Add support for Airoha EN7851 watchdog
 
 Add support for Airoha EN7851 watchdog. This is a very basic watchdog
 with no pretimeout support, max timeout is 28 seconds and it ticks based
 on half the SoC BUS clock.
 
 Signed-off-by: Christian Marangi <[email protected]>
+Reviewed-by: Guenter Roeck <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Guenter Roeck <[email protected]>
+Signed-off-by: Wim Van Sebroeck <[email protected]>
 ---
-Changes v2:
-- Drop clock-frequency implementation
-- Add missing bitfield.h header
-- Attach BUS clock
-
  drivers/watchdog/Kconfig      |   8 ++
  drivers/watchdog/Makefile     |   1 +
  drivers/watchdog/airoha_wdt.c | 216 ++++++++++++++++++++++++++++++++++

target/linux/airoha/patches-6.6/106-01-clk-en7523-remove-REG_PCIE-_-MEM-MEM_MASK-configurat.patch → target/linux/airoha/patches-6.6/033-01-v6.13-clk-en7523-remove-REG_PCIE-_-MEM-MEM_MASK-configurat.patch

@@ -1,6 +1,6 @@
-From 64e497f372dfca3e6be9fe05a0f9b874ea8604d2 Mon Sep 17 00:00:00 2001
+From c31d1cdd7bff1d2c13d435bb9d0c76bfaa332097 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:46 +0200
+Date: Tue, 12 Nov 2024 01:08:49 +0100
 Subject: [PATCH 1/6] clk: en7523: remove REG_PCIE*_{MEM,MEM_MASK}
  configuration
 
@@ -12,6 +12,8 @@ This patch does not introduce any backward incompatibility since the dts
 for EN7581 SoC is not upstream yet.
 
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 18 ------------------
  1 file changed, 18 deletions(-)

target/linux/airoha/patches-6.6/106-02-clk-en7523-move-clock_register-in-hw_init-callback.patch → target/linux/airoha/patches-6.6/033-02-v6.13-clk-en7523-move-clock_register-in-hw_init-callback.patch

@@ -1,6 +1,6 @@
-From 0dd8a6df58a4a8cf1f341249e7358b3bb51f52ad Mon Sep 17 00:00:00 2001
+From b8bdfc666bc5f58caf46e67b615132fccbaca3d4 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:47 +0200
+Date: Tue, 12 Nov 2024 01:08:50 +0100
 Subject: [PATCH 2/6] clk: en7523: move clock_register in hw_init callback
 
 Move en7523_register_clocks routine in hw_init callback.
@@ -11,6 +11,8 @@ EN7523 and EN7581 SoCs in order to access chip-scu IO region
 miscellaneous registers needed by multiple devices (clock, pinctrl ..).
 
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 82 ++++++++++++++++++++++++----------------
  1 file changed, 50 insertions(+), 32 deletions(-)

target/linux/airoha/patches-6.6/106-03-clk-en7523-introduce-chip_scu-regmap.patch → target/linux/airoha/patches-6.6/033-03-v6.13-clk-en7523-introduce-chip_scu-regmap.patch

@@ -1,6 +1,6 @@
-From f849bcb746abeaafa63b4f02f1d8bb22703fc645 Mon Sep 17 00:00:00 2001
+From f72fc22038dd544fa4d39c06e8c81c09c0041ed4 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:48 +0200
+Date: Tue, 12 Nov 2024 01:08:51 +0100
 Subject: [PATCH 3/6] clk: en7523: introduce chip_scu regmap
 
 Introduce chip_scu regmap pointer since EN7581 SoC will access chip-scu
@@ -9,6 +9,8 @@ for EN7581 SoC. This patch does not introduce any backward incompatibility
 since the dts for EN7581 SoC is not upstream yet.
 
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 81 ++++++++++++++++++++++++++++++----------
  1 file changed, 61 insertions(+), 20 deletions(-)

target/linux/airoha/patches-6.6/106-04-clk-en7523-fix-estimation-of-fixed-rate-for-EN7581.patch → target/linux/airoha/patches-6.6/033-04-v6.13-clk-en7523-fix-estimation-of-fixed-rate-for-EN7581.patch

@@ -1,6 +1,6 @@
-From b9ea4918216ca0c2511446c531d3f8163ac1466d Mon Sep 17 00:00:00 2001
+From f98eded9e9ab048c88ff59c5523e703a6ced5523 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:49 +0200
+Date: Tue, 12 Nov 2024 01:08:52 +0100
 Subject: [PATCH 4/6] clk: en7523: fix estimation of fixed rate for EN7581
 
 Introduce en7581_base_clks array in order to define per-SoC fixed-rate
@@ -9,6 +9,8 @@ clocks
 
 Fixes: 66bc47326ce2 ("clk: en7523: Add EN7581 support")
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 105 ++++++++++++++++++++++++++++++++++++++-
  1 file changed, 103 insertions(+), 2 deletions(-)

target/linux/airoha/patches-6.6/106-05-clk-en7523-move-en7581_reset_register-in-en7581_clk_.patch → target/linux/airoha/patches-6.6/033-05-v6.13-clk-en7523-move-en7581_reset_register-in-en7581_clk_.patch

@@ -1,6 +1,6 @@
-From 2c5b1a5b68973947a6919d9c951f9b3e0d84f347 Mon Sep 17 00:00:00 2001
+From 82e6bf912d5846646892becea659b39d178d79e3 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:50 +0200
+Date: Tue, 12 Nov 2024 01:08:53 +0100
 Subject: [PATCH 5/6] clk: en7523: move en7581_reset_register() in
  en7581_clk_hw_init()
 
@@ -9,6 +9,8 @@ feature is supported just by EN7581 SoC.
 Get rid of reset struct in en_clk_soc_data data struct.
 
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 93 ++++++++++++++--------------------------
  1 file changed, 33 insertions(+), 60 deletions(-)

target/linux/airoha/patches-6.6/106-06-clk-en7523-map-io-region-in-a-single-block.patch → target/linux/airoha/patches-6.6/033-06-v6.13-clk-en7523-map-io-region-in-a-single-block.patch

@@ -1,13 +1,15 @@
-From 665a59f4836c3d7813a9d8bfb9680d93adb4626e Mon Sep 17 00:00:00 2001
+From a9eaf305017a5ebe73ab34e85bd5414055a88f29 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Tue, 3 Sep 2024 23:39:51 +0200
+Date: Tue, 12 Nov 2024 01:08:54 +0100
 Subject: [PATCH 6/6] clk: en7523: map io region in a single block
 
 Map all clock-controller memory region in a single block.
 This patch does not introduce any backward incompatibility since the dts
 for EN7581 SoC is not upstream yet.
 
 Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Stephen Boyd <[email protected]>
 ---
  drivers/clk/clk-en7523.c | 32 +++++++++++++-------------------
  1 file changed, 13 insertions(+), 19 deletions(-)

target/linux/airoha/patches-6.6/107-pinctrl-airoha-Add-support-for-EN7581-SoC.patch → target/linux/airoha/patches-6.6/034-v6.13-pinctrl-airoha-Add-support-for-EN7581-SoC.patch

@@ -1,7 +1,7 @@
-From 21cb14f3e6d12d666a9ec0fd7cc01d722b04e514 Mon Sep 17 00:00:00 2001
+From 1c8ace2d0725c1c8d5012f8a56c5fb31805aad27 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <[email protected]>
-Date: Wed, 16 Oct 2024 12:07:33 +0200
-Subject: [PATCH 1/2] pinctrl: airoha: Add support for EN7581 SoC
+Date: Wed, 23 Oct 2024 01:20:05 +0200
+Subject: [PATCH] pinctrl: airoha: Add support for EN7581 SoC
 
 Introduce pinctrl driver for EN7581 SoC. Current EN7581 pinctrl driver
 supports the following functionalities:
@@ -15,8 +15,10 @@ Tested-by: Benjamin Larsson <[email protected]>
 Co-developed-by: Benjamin Larsson <[email protected]>
 Signed-off-by: Benjamin Larsson <[email protected]>
 Reviewed-by: Linus Walleij <[email protected]>
-Signed-off-by: Lorenzo Bianconi <[email protected]>
 Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
+Signed-off-by: Lorenzo Bianconi <[email protected]>
+Link: https://lore.kernel.org/[email protected]
+Signed-off-by: Linus Walleij <[email protected]>
 ---
  MAINTAINERS                               |    7 +
  drivers/pinctrl/mediatek/Kconfig          |   17 +-
@@ -25,24 +27,22 @@ Reviewed-by: AngeloGioacchino Del Regno <[email protected]
  4 files changed, 2994 insertions(+), 1 deletion(-)
  create mode 100644 drivers/pinctrl/mediatek/pinctrl-airoha.c
 
-# diff --git a/MAINTAINERS b/MAINTAINERS
-# index 8a6ea49e1a9d..ca4a78737dc6 100644
-# --- a/MAINTAINERS
-# +++ b/MAINTAINERS
-# @@ -18331,6 +18331,13 @@ F:	drivers/pinctrl/
-#  F:	include/dt-bindings/pinctrl/
-#  F:	include/linux/pinctrl/
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -16870,6 +16870,13 @@ F:	drivers/pinctrl/
+ F:	include/dt-bindings/pinctrl/
+ F:	include/linux/pinctrl/
 
-# +PIN CONTROLLER - AIROHA
-# +M:	Lorenzo Bianconi <[email protected]>
-# +L:	[email protected] (moderated for non-subscribers)
-# +S:	Maintained
-# +F:	Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
-# +F:	drivers/pinctrl/mediatek/pinctrl-airoha.c
-# +
-#  PIN CONTROLLER - AMD
-#  M:	Basavaraj Natikar <[email protected]>
-#  M:	Shyam Sundar S K <[email protected]>
++PIN CONTROLLER - AIROHA
++M:	Lorenzo Bianconi <[email protected]>
++L:	[email protected] (moderated for non-subscribers)
++S:	Maintained
++F:	Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
++F:	drivers/pinctrl/mediatek/pinctrl-airoha.c
++
+ PIN CONTROLLER - AMD
+ M:	Basavaraj Natikar <[email protected]>
+ M:	Shyam Sundar S K <[email protected]>
 --- a/drivers/pinctrl/mediatek/Kconfig
 +++ b/drivers/pinctrl/mediatek/Kconfig
 @@ -1,6 +1,6 @@