From: josh.coombs@gmail.com (Joshua Coombs)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] Allow Marvell SATA driver to work with LEDS_TRIGGER_IDE_DISK
Date: Tue, 8 Jan 2013 13:16:27 -0500 [thread overview]
Message-ID: <1357668987-3610-1-git-send-email-josh.coombs@gmail.com> (raw)
Add a call to the IDE LED Trigger within the Marvell SATA driver to allow
Marvell SoC devices to show SATA activity via GPIO connected LEDs.
Signed-off-by: Joshua Coombs <josh.coombs@gmail.com>
---
drivers/ata/sata_mv.c | 3 +++
drivers/leds/Kconfig | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 68f4fb5..4aaf6f0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -71,6 +71,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <linux/libata.h>
+#include <linux/leds.h>
#define DRV_NAME "sata_mv"
#define DRV_VERSION "1.28"
@@ -1156,6 +1157,8 @@ static void mv_start_edma(struct ata_port *ap, void __iomem *port_mmio,
{
int want_ncq = (protocol == ATA_PROT_NCQ);
+ ledtrig_ide_activity();
+
if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
if (want_ncq != using_ncq)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index b58bc8a..d2071d0 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -496,10 +496,9 @@ config LEDS_TRIGGER_ONESHOT
config LEDS_TRIGGER_IDE_DISK
bool "LED IDE Disk Trigger"
- depends on IDE_GD_ATA
depends on LEDS_TRIGGERS
help
- This allows LEDs to be controlled by IDE disk activity.
+ This allows LEDs to be controlled by IDE or SATA disk activity.
If unsure, say Y.
config LEDS_TRIGGER_HEARTBEAT
--
1.8.0.2
next reply other threads:[~2013-01-08 18:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 18:16 Joshua Coombs [this message]
2013-01-08 19:06 ` [PATCH] Allow Marvell SATA driver to work with LEDS_TRIGGER_IDE_DISK Jason Cooper
2013-01-08 19:18 ` Josh Coombs
2013-01-08 20:03 ` Jason Cooper
2013-01-09 1:29 ` Kim, Milo
2013-01-09 16:19 ` Josh Coombs
2013-01-09 16:56 ` Jeff Garzik
2013-01-09 18:45 ` Josh Coombs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357668987-3610-1-git-send-email-josh.coombs@gmail.com \
--to=josh.coombs@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).