From: Christian Lamparter <chunkeey@gmail.com>
Date: Sun, 10 Oct 2021 20:06:51 +0000 (+0200)
Subject: Revert "gpio-cdev: add nu801 userspace driver"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80b7a8a7f5a0a88fde6dd19f097df4d7cac9ff04;p=openwrt%2Fstaging%2Fjow.git

Revert "gpio-cdev: add nu801 userspace driver"

This reverts commit f536f5ebddd9c532a08ac4a9be3ef0c02f7bfeb8.

As Hauke commented, this causes builder failures on 5.4 kernels.
This revert includes changes to the mx100 kernel modules
dependency as well as the uci led definitions.

Tested-by: Chris Blake <chrisrblake93@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/package/system/gpio-cdev/nu801/Makefile b/package/system/gpio-cdev/nu801/Makefile
deleted file mode 100644
index a03d746634..0000000000
--- a/package/system/gpio-cdev/nu801/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nu801
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/chunkeey/nu801.git
-PKG_SOURCE_VERSION:=794a588fce3150129bb2e5bb37590c7daceb8927
-
-PKG_MAINTAINER:=Christian Lamparter <chunkeey@gmail.com>
-PKG_LICENSE:=GPL-3.0-or-later
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/nu801
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Userspace GPIO Drivers
-  DEPENDS:=@!LINUX_5_4 +kmod-leds-uleds
-  KCONFIG:= \
-    CONFIG_GPIO_CDEV=y
-  TITLE:=NU801 LED Driver
-endef
-
-define Package/nu801/description
-This package contains a userspace driver to power the NUMEN Tech. NU801 LED Driver.
-endef
-
-define Package/nu801/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nu801 $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/nu801.init $(1)/etc/init.d/nu801
-
-endef
-
-$(eval $(call BuildPackage,nu801))
diff --git a/package/system/gpio-cdev/nu801/files/nu801.init b/package/system/gpio-cdev/nu801/files/nu801.init
deleted file mode 100755
index 5613a92f6e..0000000000
--- a/package/system/gpio-cdev/nu801/files/nu801.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-START=15
-STOP=94
-USE_PROCD=1
-
-start_service() {
-	. /lib/functions.sh
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/nu801 "$(board_name)"
-	procd_set_param respawn 5 1 5
-	procd_close_instance
-}
diff --git a/target/linux/x86/base-files/etc/board.d/01_leds b/target/linux/x86/base-files/etc/board.d/01_leds
index 74ad2d59fe..42974d8290 100644
--- a/target/linux/x86/base-files/etc/board.d/01_leds
+++ b/target/linux/x86/base-files/etc/board.d/01_leds
@@ -9,7 +9,7 @@ board_config_update
 case "$(board_name)" in
 cisco-mx100-hw)
 	ucidef_set_led_usbport "usb" "USB" "mx100:green:usb" "1-1-port2"
-	ucidef_set_led_default "diag" "DIAG" "mx100:green:tricolor" "1"
+	ucidef_set_led_default "diag" "DIAG" "mx100:green:ha" "1"
 	;;
 pc-engines-apu1|pc-engines-apu2|pc-engines-apu3)
 	ucidef_set_led_netdev "wan" "WAN" "apu:green:3" "eth0"
diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk
index 0071ebda41..4005ee97ef 100644
--- a/target/linux/x86/modules.mk
+++ b/target/linux/x86/modules.mk
@@ -88,7 +88,7 @@ define KernelPackage/meraki-mx100
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Cisco Meraki MX100 Platform Driver
   DEPENDS:=@TARGET_x86 @!LINUX_5_4 +kmod-tg3 +kmod-gpio-button-hotplug +kmod-leds-gpio \
-    +kmod-usb-ledtrig-usbport +nu801 +kmod-itco-wdt
+    +kmod-usb-ledtrig-usbport +kmod-itco-wdt
   KCONFIG:=CONFIG_MERAKI_MX100
   FILES:=$(LINUX_DIR)/drivers/platform/x86/meraki-mx100.ko
   AUTOLOAD:=$(call AutoLoad,60,meraki-mx100,1)