[openwrt/openwrt] mediatek: build ubnt-ledbar as a module

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 4 11:58:58 PDT 2022


dangole pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/1d96f6863e335956838e1002241a018affdaa287

commit 1d96f6863e335956838e1002241a018affdaa287
Author: Chuanhong Guo <gch981213 at gmail.com>
AuthorDate: Sat Apr 30 23:08:00 2022 +0800

    mediatek: build ubnt-ledbar as a module
    
    The config for LEDS_UBNT_LEDBAR doesn't stay in mt7629 kconfig because
    of its I2C dependency. Build it as a module and let buildroot handle
    this config option instead.
    
    Signed-off-by: Chuanhong Guo <gch981213 at gmail.com>
    (cherry picked from commit d9ea9c06e98b597174e0e94e0a13934637c0c03e)
---
 target/linux/mediatek/image/mt7622.mk    |  4 ++--
 target/linux/mediatek/modules.mk         | 16 ++++++++++++++++
 target/linux/mediatek/mt7622/config-5.10 |  1 -
 target/linux/mediatek/mt7623/config-5.10 |  1 -
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index 8e0126f576..39bc7bc2ea 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -228,7 +228,7 @@ define Device/ubnt_unifi-6-lr
   DEVICE_DTS_CONFIG := config at 1
   DEVICE_DTS := mt7622-ubnt-unifi-6-lr
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-mt7915e
+  DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar
 endef
 TARGET_DEVICES += ubnt_unifi-6-lr
 
@@ -238,7 +238,7 @@ define Device/ubnt_unifi-6-lr-ubootmod
   DEVICE_VARIANT := U-Boot mod
   DEVICE_DTS := mt7622-ubnt-unifi-6-lr-ubootmod
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-mt7915e
+  DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar
   KERNEL := kernel-bin | lzma
   KERNEL_INITRAMFS_SUFFIX := -recovery.itb
   KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
diff --git a/target/linux/mediatek/modules.mk b/target/linux/mediatek/modules.mk
index 467934256c..0eb2866cf0 100644
--- a/target/linux/mediatek/modules.mk
+++ b/target/linux/mediatek/modules.mk
@@ -38,3 +38,19 @@ define KernelPackage/sdhci-mtk
 endef
 
 $(eval $(call KernelPackage,sdhci-mtk))
+
+define KernelPackage/leds-ubnt-ledbar
+  SUBMENU:=LED modules
+  TITLE:=Ubiquiti UniFi 6 LR LED support
+  KCONFIG:=CONFIG_LEDS_UBNT_LEDBAR
+  FILES:= \
+	$(LINUX_DIR)/drivers/leds/leds-ubnt-ledbar.ko
+  AUTOLOAD:=$(call AutoProbe,leds-ubnt-ledbar,1)
+  DEPENDS:=@TARGET_mediatek_mt7622 +kmod-i2c-core
+endef
+
+define KernelPackage/leds-ubnt-ledbar/description
+  LED support for Ubiquiti UniFi 6 LR
+endef
+
+$(eval $(call KernelPackage,leds-ubnt-ledbar))
diff --git a/target/linux/mediatek/mt7622/config-5.10 b/target/linux/mediatek/mt7622/config-5.10
index 89ebc61576..0c71b39cf0 100644
--- a/target/linux/mediatek/mt7622/config-5.10
+++ b/target/linux/mediatek/mt7622/config-5.10
@@ -226,7 +226,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_KEYBOARD_MTK_PMIC is not set
-CONFIG_LEDS_UBNT_LEDBAR=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
diff --git a/target/linux/mediatek/mt7623/config-5.10 b/target/linux/mediatek/mt7623/config-5.10
index 3d017400a0..a2be7b1ff8 100644
--- a/target/linux/mediatek/mt7623/config-5.10
+++ b/target/linux/mediatek/mt7623/config-5.10
@@ -343,7 +343,6 @@ CONFIG_KEYBOARD_MTK_PMIC=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_LEDS_MT6323=y
-# CONFIG_LEDS_UBNT_LEDBAR is not set
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y




More information about the lede-commits mailing list