From 8bee6a9f1df8caed264952ebdd360c57d8ceaa03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 9 Apr 2023 10:40:56 +0200 Subject: [PATCH] bmips: switch to LED kernel modules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Disable LED controllers from kernel config and switch to per device kernel modules. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bmips/config-5.15 | 5 +---- target/linux/bmips/image/bcm63xx_generic.mk | 12 ++++++++---- target/linux/bmips/image/bcm63xx_nand.mk | 15 ++++++++++----- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/target/linux/bmips/config-5.15 b/target/linux/bmips/config-5.15 index c38a4450abfb..3fc58d01dd84 100644 --- a/target/linux/bmips/config-5.15 +++ b/target/linux/bmips/config-5.15 @@ -125,9 +125,7 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_MIPS_CPU=y CONFIG_IRQ_WORK=y -CONFIG_LEDS_BCM6328=y -CONFIG_LEDS_BCM6358=y -CONFIG_LEDS_GPIO=y +# CONFIG_LEDS_SERCOMM_MSP430 is not set CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LZO_COMPRESS=y @@ -190,7 +188,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y -CONFIG_PAHOLE_VERSION=0 CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_BCM6318=y diff --git a/target/linux/bmips/image/bcm63xx_generic.mk b/target/linux/bmips/image/bcm63xx_generic.mk index 33282bd1a501..2c832fe8ba92 100644 --- a/target/linux/bmips/image/bcm63xx_generic.mk +++ b/target/linux/bmips/image/bcm63xx_generic.mk @@ -33,7 +33,8 @@ define Device/comtrend_ar-5315u CHIP_ID := 6318 CFE_BOARD_ID := 96318A-1441N1 FLASH_MB := 16 - DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ + kmod-leds-bcm6328 endef TARGET_DEVICES += comtrend_ar-5315u @@ -44,7 +45,8 @@ define Device/comtrend_ar-5387un CHIP_ID := 6328 CFE_BOARD_ID := 96328A-1441N1 FLASH_MB := 16 - DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ + kmod-leds-bcm6328 endef TARGET_DEVICES += comtrend_ar-5387un @@ -56,7 +58,8 @@ define Device/comtrend_vr-3025u CFE_BOARD_ID := 96368M-1541N BLOCKSIZE := 0x20000 FLASH_MB := 32 - DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ + kmod-leds-gpio endef TARGET_DEVICES += comtrend_vr-3025u @@ -69,6 +72,7 @@ define Device/huawei_hg556a-b CFE_BOARD_ID := HW556 CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8 BLOCKSIZE := 0x20000 - DEVICE_PACKAGES += $(USB2_PACKAGES) $(ATH9K_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) $(ATH9K_PACKAGES) \ + kmod-leds-gpio endef TARGET_DEVICES += huawei_hg556a-b diff --git a/target/linux/bmips/image/bcm63xx_nand.mk b/target/linux/bmips/image/bcm63xx_nand.mk index faed7a091982..732a5accdc56 100644 --- a/target/linux/bmips/image/bcm63xx_nand.mk +++ b/target/linux/bmips/image/bcm63xx_nand.mk @@ -58,7 +58,8 @@ define Device/comtrend_vr-3032u PAGESIZE := 2048 SUBPAGESIZE := 512 VID_HDR_OFFSET := 2048 - DEVICE_PACKAGES += $(USB2_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) \ + kmod-leds-bcm6328 CFE_WFI_FLASH_TYPE := 3 CFE_WFI_VERSION := 0x5732 endef @@ -80,7 +81,8 @@ define Device/huawei_hg253s-v2 PAGESIZE := 2048 SUBPAGESIZE := 512 VID_HDR_OFFSET := 2048 - DEVICE_PACKAGES += $(USB2_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) \ + kmod-leds-bcm6328 kmod-leds-gpio CFE_WFI_FLASH_TYPE := 3 endef TARGET_DEVICES += huawei_hg253s-v2 @@ -96,7 +98,8 @@ define Device/netgear_dgnd3700-v2 CFE_RAM_JFFS2_PAD := 496k BLOCKSIZE := 16k PAGESIZE := 512 - DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) $(B43_PACKAGES) \ + kmod-leds-bcm6328 kmod-leds-gpio CFE_WFI_FLASH_TYPE := 2 CFE_WFI_VERSION := 0x5731 endef @@ -115,7 +118,8 @@ define Device/sercomm_h500-s-lowi PAGESIZE := 2048 SUBPAGESIZE := 512 VID_HDR_OFFSET := 2048 - DEVICE_PACKAGES += $(USB2_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) \ + kmod-leds-bcm6328 SERCOMM_FSVER := 1001 SERCOMM_HWVER := 1434b31 SERCOMM_SWVER := 3305 @@ -135,7 +139,8 @@ define Device/sercomm_h500-s-vfes PAGESIZE := 2048 SUBPAGESIZE := 512 VID_HDR_OFFSET := 2048 - DEVICE_PACKAGES += $(USB2_PACKAGES) + DEVICE_PACKAGES += $(USB2_PACKAGES) \ + kmod-leds-bcm6328 SERCOMM_FSVER := 1001 SERCOMM_HWVER := 142584b SERCOMM_SWVER := 3417 -- 2.30.2