From f7fd2abf259c7a463d215fc0e52c15ae77a050de Mon Sep 17 00:00:00 2001 From: Alberto Bursi Date: Thu, 30 Mar 2017 12:34:42 +0200 Subject: [PATCH] kirkwood: set sata/usb led trigger for NSA3xx these two devices have a Sata led for each sata port. These leds must be controlled separately by a special sata led trigger already used in oxnas target. Both these devices have a single USB led, and to keep consistent behaviour with the Sata leds that show sata activity, this led uses usb-host trigger to show usb activity. Signed-off-by: Alberto Bursi --- target/linux/kirkwood/base-files/etc/board.d/01_leds | 6 ++++++ target/linux/kirkwood/config-4.4 | 3 +++ .../210-enable-sata-port-specific-led-triggers.patch | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 target/linux/kirkwood/patches-4.4/210-enable-sata-port-specific-led-triggers.patch diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds index e6da9fd49a..0608440533 100755 --- a/target/linux/kirkwood/base-files/etc/board.d/01_leds +++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds @@ -40,9 +40,15 @@ case "$board" in ;; "nsa310b") ucidef_set_led_default "health" "health" "nsa310:green:sys" "1" + ucidef_set_led_usbhost "usb" "USB" "nsa310:green:usb" + ucidef_set_led_ataport "hdd" "HDD" "nsa310:green:hdd" "1" + ucidef_set_led_ataport "esata" "eSata" "nsa310:green:esata" "2" ;; "nsa325") ucidef_set_led_default "health" "health" "nsa325:green:sys" "1" + ucidef_set_led_usbhost "usb" "USB" "nsa325:green:usb" + ucidef_set_led_ataport "hdd1" "HDD1" "nsa325:green:sata1" "1" + ucidef_set_led_ataport "hdd2" "HDD2" "nsa325:green:sata2" "2" ;; "sheevaplug" | \ "sheevaplug-esata") diff --git a/target/linux/kirkwood/config-4.4 b/target/linux/kirkwood/config-4.4 index f5d3164e61..67a876008e 100644 --- a/target/linux/kirkwood/config-4.4 +++ b/target/linux/kirkwood/config-4.4 @@ -26,6 +26,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_WANT_LIBATA_LEDS=y CONFIG_ARM=y # CONFIG_ARMADA_THERMAL is not set CONFIG_ARM_APPENDED_DTB=y @@ -41,6 +42,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_THUMB is not set CONFIG_ATA=y CONFIG_ATAGS=y +CONFIG_ATA_LEDS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BLK_DEV_SD=y CONFIG_CACHE_FEROCEON_L2=y @@ -306,6 +308,7 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_ORION=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_PCI=y +CONFIG_USB_LED_TRIG=y CONFIG_USB_STORAGE=y CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set diff --git a/target/linux/kirkwood/patches-4.4/210-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-4.4/210-enable-sata-port-specific-led-triggers.patch new file mode 100644 index 0000000000..96c4f7b255 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/210-enable-sata-port-specific-led-triggers.patch @@ -0,0 +1,10 @@ +--- a/arch/arm/mach-mvebu/Kconfig ++++ b/arch/arm/mach-mvebu/Kconfig +@@ -105,6 +105,7 @@ config MACH_DOVE + config MACH_KIRKWOOD + bool "Marvell Kirkwood boards" if ARCH_MULTI_V5 + select ARCH_REQUIRE_GPIOLIB ++ select ARCH_WANT_LIBATA_LEDS + select CPU_FEROCEON + select KIRKWOOD_CLK + select MACH_MVEBU_ANY -- 2.30.2