* [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger
@ 2007-10-01 10:45 Yoichi Yuasa
2007-10-01 10:46 ` [PATCH][2/3] add Cobalt Qube series front LED support to platform register Yoichi Yuasa
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yoichi Yuasa @ 2007-10-01 10:45 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, linux-mips, Richard Purdie
Hi Ralf,
The Cobalt LED drivers have already been queued for 2.6.24.
Please queue these patches too.
Yoichi
---
Add Cobalt Raq LED platform register and power off trigger.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/Makefile mips/arch/mips/cobalt/Makefile
--- mips-orig/arch/mips/cobalt/Makefile 2007-09-21 10:24:16.864636000 +0900
+++ mips/arch/mips/cobalt/Makefile 2007-09-21 11:25:43.384914000 +0900
@@ -2,7 +2,7 @@
# Makefile for the Cobalt micro systems family specific parts of the kernel
#
-obj-y := buttons.o irq.o reset.o rtc.o serial.o setup.o
+obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o
obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_EARLY_PRINTK) += console.o
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/led.c mips/arch/mips/cobalt/led.c
--- mips-orig/arch/mips/cobalt/led.c 1970-01-01 09:00:00.000000000 +0900
+++ mips/arch/mips/cobalt/led.c 2007-09-21 11:26:18.519109750 +0900
@@ -0,0 +1,56 @@
+/*
+ * Registration of Cobalt LED platform device.
+ *
+ * Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+static struct resource cobalt_led_resource __initdata = {
+ .start = 0x1c000000,
+ .end = 0x1c000000,
+ .flags = IORESOURCE_MEM,
+};
+
+static __init int cobalt_led_add(void)
+{
+ struct platform_device *pdev;
+ int retval;
+
+ pdev = platform_device_alloc("cobalt-raq-leds", -1);
+
+ if (!pdev)
+ return -ENOMEM;
+
+ retval = platform_device_add_resources(pdev, &cobalt_led_resource, 1);
+ if (retval)
+ goto err_free_device;
+
+ retval = platform_device_add(pdev);
+ if (retval)
+ goto err_free_device;
+
+ return 0;
+
+err_free_device:
+ platform_device_put(pdev);
+
+ return retval;
+}
+device_initcall(cobalt_led_add);
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/reset.c mips/arch/mips/cobalt/reset.c
--- mips-orig/arch/mips/cobalt/reset.c 2007-09-21 10:24:16.864636000 +0900
+++ mips/arch/mips/cobalt/reset.c 2007-09-21 11:25:43.616928500 +0900
@@ -8,31 +8,37 @@
* Copyright (C) 1995, 1996, 1997 by Ralf Baechle
* Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
*/
+#include <linux/init.h>
#include <linux/jiffies.h>
-
-#include <asm/io.h>
-#include <asm/reboot.h>
+#include <linux/leds.h>
#include <cobalt.h>
+DEFINE_LED_TRIGGER(power_off_led_trigger);
+
+static int __init ledtrig_power_off_init(void)
+{
+ led_trigger_register_simple("power-off", &power_off_led_trigger);
+ return 0;
+}
+device_initcall(ledtrig_power_off_init);
+
void cobalt_machine_halt(void)
{
int state, last, diff;
unsigned long mark;
/*
- * turn off bar on Qube, flash power off LED on RaQ (0.5Hz)
+ * turn on power off LED on RaQ
*
* restart if ENTER and SELECT are pressed
*/
last = COBALT_KEY_PORT;
- for (state = 0;;) {
-
- state ^= COBALT_LED_POWER_OFF;
- COBALT_LED_PORT = state;
+ led_trigger_event(power_off_led_trigger, LED_FULL);
+ for (state = 0;;) {
diff = COBALT_KEY_PORT ^ last;
last ^= diff;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH][2/3] add Cobalt Qube series front LED support to platform register
2007-10-01 10:45 [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Yoichi Yuasa
@ 2007-10-01 10:46 ` Yoichi Yuasa
2007-10-01 11:37 ` Ralf Baechle
2007-10-01 10:48 ` [PATCH][3/3] add LED support to cobalt_defconfig Yoichi Yuasa
2007-10-01 11:37 ` [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Ralf Baechle
2 siblings, 1 reply; 6+ messages in thread
From: Yoichi Yuasa @ 2007-10-01 10:46 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, linux-mips, Richard Purdie
Add Cobalt Qube series front LED support to platform register.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/led.c mips/arch/mips/cobalt/led.c
--- mips-orig/arch/mips/cobalt/led.c 2007-09-21 13:05:53.812412000 +0900
+++ mips/arch/mips/cobalt/led.c 2007-09-21 13:20:02.105427000 +0900
@@ -22,6 +22,8 @@
#include <linux/ioport.h>
#include <linux/platform_device.h>
+#include <cobalt.h>
+
static struct resource cobalt_led_resource __initdata = {
.start = 0x1c000000,
.end = 0x1c000000,
@@ -33,7 +35,11 @@ static __init int cobalt_led_add(void)
struct platform_device *pdev;
int retval;
- pdev = platform_device_alloc("cobalt-raq-leds", -1);
+ if (cobalt_board_id == COBALT_BRD_ID_QUBE1 ||
+ cobalt_board_id == COBALT_BRD_ID_QUBE2)
+ pdev = platform_device_alloc("cobalt-qube-leds", -1);
+ else
+ pdev = platform_device_alloc("cobalt-raq-leds", -1);
if (!pdev)
return -ENOMEM;
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH][3/3] add LED support to cobalt_defconfig
2007-10-01 10:45 [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Yoichi Yuasa
2007-10-01 10:46 ` [PATCH][2/3] add Cobalt Qube series front LED support to platform register Yoichi Yuasa
@ 2007-10-01 10:48 ` Yoichi Yuasa
2007-10-01 11:37 ` Ralf Baechle
2007-10-01 11:37 ` [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Ralf Baechle
2 siblings, 1 reply; 6+ messages in thread
From: Yoichi Yuasa @ 2007-10-01 10:48 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, linux-mips, Richard Purdie
Add LED support to cobalt_defconfig.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/cobalt_defconfig mips/arch/mips/configs/cobalt_defconfig
--- mips-orig/arch/mips/configs/cobalt_defconfig 2007-09-06 13:09:26.597218500 +0900
+++ mips/arch/mips/configs/cobalt_defconfig 2007-09-06 13:21:20.681846000 +0900
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc2
-# Tue Aug 7 22:12:54 2007
+# Linux kernel version: 2.6.23-rc5
+# Thu Sep 6 13:14:29 2007
#
CONFIG_MIPS=y
@@ -55,12 +55,14 @@ CONFIG_DMA_NONCOHERENT=y
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_EARLY_PRINTK=y
CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_HOTPLUG_CPU is not set
CONFIG_I8259=y
# CONFIG_NO_IOPORT is not set
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_IRQ_CPU=y
+CONFIG_IRQ_GT641XX=y
CONFIG_PCI_GT64XXX_PCI0=y
CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -235,6 +237,7 @@ CONFIG_TRAD_SIGNALS=y
# Power management options
#
# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
#
# Networking
@@ -844,7 +847,21 @@ CONFIG_USB_MON=y
#
# CONFIG_USB_GADGET is not set
# CONFIG_MMC is not set
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_COBALT_QUBE=y
+CONFIG_LEDS_COBALT_RAQ=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
# CONFIG_INFINIBAND is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger
2007-10-01 10:45 [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Yoichi Yuasa
2007-10-01 10:46 ` [PATCH][2/3] add Cobalt Qube series front LED support to platform register Yoichi Yuasa
2007-10-01 10:48 ` [PATCH][3/3] add LED support to cobalt_defconfig Yoichi Yuasa
@ 2007-10-01 11:37 ` Ralf Baechle
2 siblings, 0 replies; 6+ messages in thread
From: Ralf Baechle @ 2007-10-01 11:37 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips, Richard Purdie
On Mon, Oct 01, 2007 at 07:45:05PM +0900, Yoichi Yuasa wrote:
> Add Cobalt Raq LED platform register and power off trigger.
Queued for 2.6.24. Thanks!
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][2/3] add Cobalt Qube series front LED support to platform register
2007-10-01 10:46 ` [PATCH][2/3] add Cobalt Qube series front LED support to platform register Yoichi Yuasa
@ 2007-10-01 11:37 ` Ralf Baechle
0 siblings, 0 replies; 6+ messages in thread
From: Ralf Baechle @ 2007-10-01 11:37 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips, Richard Purdie
On Mon, Oct 01, 2007 at 07:46:50PM +0900, Yoichi Yuasa wrote:
Queued for 2.6.24. Thanks!
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][3/3] add LED support to cobalt_defconfig
2007-10-01 10:48 ` [PATCH][3/3] add LED support to cobalt_defconfig Yoichi Yuasa
@ 2007-10-01 11:37 ` Ralf Baechle
0 siblings, 0 replies; 6+ messages in thread
From: Ralf Baechle @ 2007-10-01 11:37 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips, Richard Purdie
On Mon, Oct 01, 2007 at 07:48:31PM +0900, Yoichi Yuasa wrote:
Queued for 2.6.24. Thanks!
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-10-01 11:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-01 10:45 [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Yoichi Yuasa
2007-10-01 10:46 ` [PATCH][2/3] add Cobalt Qube series front LED support to platform register Yoichi Yuasa
2007-10-01 11:37 ` Ralf Baechle
2007-10-01 10:48 ` [PATCH][3/3] add LED support to cobalt_defconfig Yoichi Yuasa
2007-10-01 11:37 ` Ralf Baechle
2007-10-01 11:37 ` [PATCH][1/3] add Cobalt Raq LED platform register and power off trigger Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox