From: Bryan Wu <bryan.wu@canonical.com>
To: linux@arm.linux.org.uk, rpurdie@rpsys.net,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linus.walleij@linaro.org,
akpm@linux-foundation.org, arnd.bergmann@linaro.org,
nicolas.pitre@linaro.org, tim.gardner@canonical.com
Subject: [PATCH 07/19] ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger
Date: Mon, 30 Apr 2012 15:37:12 +0800 [thread overview]
Message-ID: <1335771444-26361-8-git-send-email-bryan.wu@canonical.com> (raw)
In-Reply-To: <1335771444-26361-1-git-send-email-bryan.wu@canonical.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
---
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5182-setup.c | 72 ++++++++------------------
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
4 files changed, 22 insertions(+), 53 deletions(-)
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 292038f..698ad13 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -18,7 +18,6 @@
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index c44eaba..0379f5b 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -19,7 +19,6 @@
#include <linux/i2c.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index e3ce617..8bc8962 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -19,8 +19,8 @@
#include <linux/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/i2c.h>
+#include <linux/leds.h>
#include <asm/mach-types.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
@@ -53,12 +53,6 @@
#define RD88F5182_PCI_SLOT0_IRQ_A_PIN 7
#define RD88F5182_PCI_SLOT0_IRQ_B_PIN 6
-/*
- * GPIO Debug LED
- */
-
-#define RD88F5182_GPIO_DBG_LED 0
-
/*****************************************************************************
* 16M NOR Flash on Device bus CS1
****************************************************************************/
@@ -83,55 +77,32 @@ static struct platform_device rd88f5182_nor_flash = {
.resource = &rd88f5182_nor_flash_resource,
};
-#ifdef CONFIG_LEDS
-
/*****************************************************************************
- * Use GPIO debug led as CPU active indication
+ * Use GPIO LED as CPU active indication
****************************************************************************/
-static void rd88f5182_dbgled_event(led_event_t evt)
-{
- int val;
-
- if (evt == led_idle_end)
- val = 1;
- else if (evt == led_idle_start)
- val = 0;
- else
- return;
-
- gpio_set_value(RD88F5182_GPIO_DBG_LED, val);
-}
-
-static int __init rd88f5182_dbgled_init(void)
-{
- int pin;
-
- if (machine_is_rd88f5182()) {
- pin = RD88F5182_GPIO_DBG_LED;
+#define RD88F5182_GPIO_LED 0
- if (gpio_request(pin, "DBGLED") == 0) {
- if (gpio_direction_output(pin, 0) != 0) {
- printk(KERN_ERR "rd88f5182_dbgled_init failed "
- "to set output pin %d\n", pin);
- gpio_free(pin);
- return 0;
- }
- } else {
- printk(KERN_ERR "rd88f5182_dbgled_init failed "
- "to request gpio %d\n", pin);
- return 0;
- }
-
- leds_event = rd88f5182_dbgled_event;
- }
-
- return 0;
-}
+static struct gpio_led rd88f5182_gpio_led_pins[] = {
+ {
+ .name = "rd88f5182:cpu",
+ .default_trigger = "cpu0",
+ .gpio = RD88F5182_GPIO_LED,
+ },
+};
-__initcall(rd88f5182_dbgled_init);
+static struct gpio_led_platform_data rd88f5182_gpio_led_data = {
+ .leds = rd88f5182_gpio_led_pins,
+ .num_leds = ARRAY_SIZE(rd88f5182_gpio_led_pins),
+};
-#endif
+static struct platform_device rd88f5182_gpio_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &rd88f5182_gpio_led_data,
+ },
+};
/*****************************************************************************
* PCI
@@ -299,6 +270,7 @@ static void __init rd88f5182_init(void)
orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
platform_device_register(&rd88f5182_nor_flash);
+ platform_device_register(&rd88f5182_gpio_leds);
i2c_register_board_info(0, &rd88f5182_i2c_rtc, 1);
}
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 2c5fab0..e2fd500 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -21,7 +21,6 @@
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
--
1.7.9.5
next prev parent reply other threads:[~2012-04-30 7:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 7:37 [PATCH v7 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM Bryan Wu
2012-04-30 7:37 ` [PATCH 01/19] led-triggers: rename *trigger to *trig for unified naming scheme Bryan Wu
2012-04-30 7:37 ` [PATCH 02/19] led-triggers: create a trigger for CPU activity Bryan Wu
2012-04-30 13:03 ` Tim Gardner
2012-05-01 11:45 ` Bryan Wu
2012-05-01 12:46 ` Tim Gardner
2012-04-30 7:37 ` [PATCH 03/19] ARM: at91: convert old leds drivers to gpio_led and led_trigger drivers Bryan Wu
2012-04-30 7:37 ` [PATCH 04/19] ARM: mach-realview and mach-versatile: retire custom LED code Bryan Wu
2012-04-30 7:37 ` [PATCH 05/19] ARM: mach-ks8695: remove leds driver, since nobody use it Bryan Wu
2012-04-30 7:37 ` [PATCH 06/19] ARM: mach-shark: retire custom LED code Bryan Wu
2012-04-30 7:37 ` Bryan Wu [this message]
2012-04-30 7:37 ` [PATCH 08/19] ARM: mach-integrator: move CM_CTRL to header file for accessing by other functions Bryan Wu
2012-04-30 7:37 ` [PATCH 09/19] ARM: mach-integrator: retire custom LED code Bryan Wu
2012-04-30 7:37 ` [PATCH 10/19] ARM: mach-clps711x: retire custom LED code of P720T machine Bryan Wu
2012-04-30 7:37 ` [PATCH 11/19] ARM: mach-ebsa110: retire custom LED code Bryan Wu
2012-04-30 7:37 ` [PATCH 12/19] ARM: mach-footbridge: " Bryan Wu
2012-04-30 7:37 ` [PATCH 13/19] char: nwflash: remove old led event code Bryan Wu
2012-04-30 7:37 ` [PATCH 14/19] ARM: mach-pxa: retire custom LED code Bryan Wu
2012-04-30 7:37 ` [PATCH 15/19] ARM: plat-samsung: remove including old leds event API header file Bryan Wu
2012-04-30 7:37 ` [PATCH 16/19] ARM: mach-pnx4008: " Bryan Wu
2012-04-30 7:37 ` [PATCH 17/19] ARM: mach-omap1: retire custom LED code Bryan Wu
2012-04-30 7:37 ` [PATCH 18/19] ARM: mach-sa1100: " Bryan Wu
2012-04-30 7:44 ` [PATCH v7 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM Bryan Wu
2012-05-01 15:01 [PATCH v9 " Bryan Wu
2012-05-01 15:01 ` [PATCH 07/19] ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger Bryan Wu
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=1335771444-26361-8-git-send-email-bryan.wu@canonical.com \
--to=bryan.wu@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=arnd.bergmann@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.pitre@linaro.org \
--cc=rpurdie@rpsys.net \
--cc=tim.gardner@canonical.com \
/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
all inboxes | Powered by JetHome®