Merge pull request torvalds#44 from HarveyHunt/ci20-v3.18-leds

Use the new Ci20's LEDs to show CPU and NAND activity
aejsmith · Jul 7, 2015 · 78e5479 · 78e5479
2 parents 0f231e7 + 2f6e4c1
commit 78e5479
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/arch/mips/boot/dts/ci20.dts b/arch/mips/boot/dts/ci20.dts
@@ -101,6 +101,22 @@
 		type = <RFKILL_TYPE_BLUETOOTH>;
 		vrfkill-supply = <&bt_reset>;
 	};
+
+	leds {
+		compatible = "gpio-leds";
+		led1 {
+			gpios = <&gpc 0 0>;
+			linux,default-trigger = "cpu0";
+		};
+		led2 {
+			gpios = <&gpc 1 0>;
+			linux,default-trigger = "cpu1";
+		};
+		led3 {
+			gpios = <&gpc 2 0>;
+			linux,default-trigger = "nand-disk";
+		};
+	};
 };
 
 &ext {

diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
@@ -14,6 +14,7 @@
 #include <linux/export.h>
 #include <linux/init.h>
 #include <linux/irqflags.h>
+#include <linux/leds.h>
 #include <linux/printk.h>
 #include <linux/sched.h>
 #include <asm/cpu.h>
@@ -259,10 +260,13 @@ void __init check_wait(void)
 
 void arch_cpu_idle(void)
 {
-	if (cpu_wait)
+	if (cpu_wait) {
+		ledtrig_cpu(CPU_LED_IDLE_START);
 		cpu_wait();
-	else
+		ledtrig_cpu(CPU_LED_IDLE_END);
+	} else {
 		local_irq_enable();
+	}
 }
 
 #ifdef CONFIG_CPU_IDLE