Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: move ubnt ledbar driver to a separate package

Browse source 
Simplifies the tree by removing a non-upstream kernel patch and related kconfig
symbols

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2022-09-30 11:26:47 +02:00
parent a0a4cfd83b
commit 4363faef8a
13 changed files with 45 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
package/kernel/ubnt-ledbar/Makefile Normal file
View file

@ -0,0 +1,34 @@
#
# Copyright (C) 2008-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ubnt-ledbar
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
define KernelPackage/leds-ubnt-ledbar
SUBMENU:=LED modules
TITLE:=Ubiquiti UniFi 6 LR LED support
FILES:= \
$(PKG_BUILD_DIR)/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
define Build/Compile
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
endef
$(eval $(call KernelPackage,leds-ubnt-ledbar))

1
package/kernel/ubnt-ledbar/src/Makefile Normal file
View file

@ -0,0 +1 @@
obj-m := leds-ubnt-ledbar.o

0
target/linux/generic/files/drivers/leds/leds-ubnt-ledbar.c → package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c
View file

10
target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch
View file

@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -941,6 +941,17 @@ config LEDS_UBNT_LEDBAR @@ -931,6 +931,17 @@ config LEDS_ACER_A500
To compile this driver as a module, choose M here: the module
will be called leds-ubnt-ledbar. source "drivers/leds/blink/Kconfig"
+config LEDS_RESET +config LEDS_RESET
+ tristate "LED support for reset-controller API" + tristate "LED support for reset-controller API"
@ -176,10 +176,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_ALIAS("platform:leds-reset"); +MODULE_ALIAS("platform:leds-reset");
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -94,6 +94,7 @@ obj-$(CONFIG_LEDS_WM831X_STATUS) += leds @@ -93,6 +93,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
+obj-$(CONFIG_LEDS_RESET) += leds-reset.o +obj-$(CONFIG_LEDS_RESET) += leds-reset.o
# LED SPI Drivers # LED SPI Drivers

10
target/linux/ath79/patches-5.15/0003-leds-add-reset-controller-based-driver.patch
View file

@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -886,6 +886,17 @@ config LEDS_UBNT_LEDBAR @@ -876,6 +876,17 @@ source "drivers/leds/blink/Kconfig"
To compile this driver as a module, choose M here: the module comment "Flash and Torch LED drivers"
will be called leds-ubnt-ledbar. source "drivers/leds/flash/Kconfig"
+config LEDS_RESET +config LEDS_RESET
+ tristate "LED support for reset-controller API" + tristate "LED support for reset-controller API"
@ -176,10 +176,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_ALIAS("platform:leds-reset"); +MODULE_ALIAS("platform:leds-reset");
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_LEDS_WM831X_STATUS) += leds @@ -87,6 +87,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
+obj-$(CONFIG_LEDS_RESET) += leds-reset.o +obj-$(CONFIG_LEDS_RESET) += leds-reset.o
# LED SPI Drivers # LED SPI Drivers

1
target/linux/generic/config-5.10
View file

@ -3045,7 +3045,6 @@ CONFIG_LEDS_TRIGGER_NETDEV=y
CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TIMER=y
# CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
# CONFIG_LEDS_TURRIS_OMNIA is not set # CONFIG_LEDS_TURRIS_OMNIA is not set
# CONFIG_LEDS_UBNT_LEDBAR is not set
# CONFIG_LEDS_USER is not set # CONFIG_LEDS_USER is not set
# CONFIG_LED_TRIGGER_PHY is not set # CONFIG_LED_TRIGGER_PHY is not set
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set

1
target/linux/generic/config-5.15
View file

@ -3148,7 +3148,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
# CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
# CONFIG_LEDS_TRIGGER_TTY is not set # CONFIG_LEDS_TRIGGER_TTY is not set
# CONFIG_LEDS_TURRIS_OMNIA is not set # CONFIG_LEDS_TURRIS_OMNIA is not set
# CONFIG_LEDS_UBNT_LEDBAR is not set
# CONFIG_LEDS_USER is not set # CONFIG_LEDS_USER is not set
# CONFIG_LED_TRIGGER_PHY is not set # CONFIG_LED_TRIGGER_PHY is not set
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set

29
target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch
View file

@ -1,29 +0,0 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -931,6 +931,16 @@ config LEDS_ACER_A500
source "drivers/leds/blink/Kconfig"
+config LEDS_UBNT_LEDBAR
+ tristate "LED support for Ubiquiti UniFi 6 LR"
+ depends on LEDS_CLASS && I2C && OF
+ help
+ This option enables support for the Ubiquiti LEDBAR
+ LED driver.
+
+ To compile this driver as a module, choose M here: the module
+ will be called leds-ubnt-ledbar.
+
comment "LED Triggers"
source "drivers/leds/trigger/Kconfig"
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
+obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
# LED SPI Drivers
obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.o

29
target/linux/generic/hack-5.15/800-ubnt-ledbar-driver.patch
View file

@ -1,29 +0,0 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -876,6 +876,16 @@ source "drivers/leds/blink/Kconfig"
comment "Flash and Torch LED drivers"
source "drivers/leds/flash/Kconfig"
+config LEDS_UBNT_LEDBAR
+ tristate "LED support for Ubiquiti UniFi 6 LR"
+ depends on LEDS_CLASS && I2C && OF
+ help
+ This option enables support for the Ubiquiti LEDBAR
+ LED driver.
+
+ To compile this driver as a module, choose M here: the module
+ will be called leds-ubnt-ledbar.
+
comment "LED Triggers"
source "drivers/leds/trigger/Kconfig"
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
+obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
# LED SPI Drivers
obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.o

1
target/linux/mediatek/filogic/config-5.15
View file

@ -197,7 +197,6 @@ CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_JBD2=y CONFIG_JBD2=y
CONFIG_JUMP_LABEL=y CONFIG_JUMP_LABEL=y
# CONFIG_LEDS_UBNT_LEDBAR is not set
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LOCK_SPIN_ON_OWNER=y

14
target/linux/mediatek/modules.mk
View file

@ -39,18 +39,4 @@ endef
$(eval $(call KernelPackage,sdhci-mtk)) $(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))

1
target/linux/ramips/mt7621/config-5.10
View file

@ -110,7 +110,6 @@ CONFIG_IRQ_MIPS_CPU=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
# CONFIG_KERNEL_ZSTD is not set # CONFIG_KERNEL_ZSTD is not set
CONFIG_LED_TRIGGER_PHY=y CONFIG_LED_TRIGGER_PHY=y
CONFIG_LEDS_UBNT_LEDBAR=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_LZO_COMPRESS=y CONFIG_LZO_COMPRESS=y

1
target/linux/ramips/mt7621/config-5.15
View file

@ -111,7 +111,6 @@ CONFIG_IRQ_FORCED_THREADING=y
CONFIG_IRQ_MIPS_CPU=y CONFIG_IRQ_MIPS_CPU=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL=y
CONFIG_LEDS_UBNT_LEDBAR=y
CONFIG_LED_TRIGGER_PHY=y CONFIG_LED_TRIGGER_PHY=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y