From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/16] ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
Date: Fri, 20 Jul 2012 19:35:48 +0200 [thread overview]
Message-ID: <1342805751-18048-14-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1342805751-18048-1-git-send-email-andrew@lunn.ch>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Josh Coombs <josh.coombs@gmail.com>
---
arch/arm/boot/dts/kirkwood-goflexnet.dts | 50 ++++++++++++++++++
arch/arm/mach-kirkwood/board-goflexnet.c | 84 ------------------------------
2 files changed, 50 insertions(+), 84 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index c5d5a4e..f6974d1 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -45,5 +45,55 @@
reg = <0x02500000 0xd800000>;
};
};
+ sata at 80000 {
+ status = "okay";
+ nr-ports = <2>;
+ };
+
+ };
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 1>;
+ linux,default-trigger = "default-on";
+ };
+ fault {
+ label = "status:orange:fault";
+ gpios = <&gpio1 15 1>;
+ };
+ left0 {
+ label = "status:white:left0";
+ gpios = <&gpio1 10 0>;
+ };
+ left1 {
+ label = "status:white:left1";
+ gpios = <&gpio1 11 0>;
+ };
+ left2 {
+ label = "status:white:left2";
+ gpios = <&gpio1 12 0>;
+ };
+ left3 {
+ label = "status:white:left3";
+ gpios = <&gpio1 13 0>;
+ };
+ right0 {
+ label = "status:white:right0";
+ gpios = <&gpio1 6 0>;
+ };
+ right1 {
+ label = "status:white:right1";
+ gpios = <&gpio1 7 0>;
+ };
+ right2 {
+ label = "status:white:right2";
+ gpios = <&gpio1 8 0>;
+ };
+ right3 {
+ label = "status:white:right3";
+ gpios = <&gpio1 9 0>;
+ };
};
};
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 3957ece..413e2c8 100644
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -27,7 +27,6 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/gpio.h>
-#include <linux/leds.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -41,86 +40,6 @@ static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
-static struct mv_sata_platform_data goflexnet_sata_data = {
- .n_ports = 2,
-};
-
-static struct gpio_led goflexnet_led_pins[] = {
- {
- .name = "status:green:health",
- .default_trigger = "default-on",
- .gpio = 46,
- .active_low = 1,
- },
- {
- .name = "status:orange:fault",
- .default_trigger = "none",
- .gpio = 47,
- .active_low = 1,
- },
- {
- .name = "status:white:left0",
- .default_trigger = "none",
- .gpio = 42,
- .active_low = 0,
- },
- {
- .name = "status:white:left1",
- .default_trigger = "none",
- .gpio = 43,
- .active_low = 0,
- },
- {
- .name = "status:white:left2",
- .default_trigger = "none",
- .gpio = 44,
- .active_low = 0,
- },
- {
- .name = "status:white:left3",
- .default_trigger = "none",
- .gpio = 45,
- .active_low = 0,
- },
- {
- .name = "status:white:right0",
- .default_trigger = "none",
- .gpio = 38,
- .active_low = 0,
- },
- {
- .name = "status:white:right1",
- .default_trigger = "none",
- .gpio = 39,
- .active_low = 0,
- },
- {
- .name = "status:white:right2",
- .default_trigger = "none",
- .gpio = 40,
- .active_low = 0,
- },
- {
- .name = "status:white:right3",
- .default_trigger = "none",
- .gpio = 41,
- .active_low = 0,
- },
-};
-
-static struct gpio_led_platform_data goflexnet_led_data = {
- .leds = goflexnet_led_pins,
- .num_leds = ARRAY_SIZE(goflexnet_led_pins),
-};
-
-static struct platform_device goflexnet_leds = {
- .name = "leds-gpio",
- .id = -1,
- .dev = {
- .platform_data = &goflexnet_led_data,
- }
-};
-
static unsigned int goflexnet_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
MPP47_GPIO, /* LED Orange */
@@ -149,7 +68,4 @@ void __init goflexnet_init(void)
kirkwood_ehci_init();
kirkwood_ge00_init(&goflexnet_ge00_data);
- kirkwood_sata_init(&goflexnet_sata_data);
-
- platform_device_register(&goflexnet_leds);
}
--
1.7.10
next prev parent reply other threads:[~2012-07-20 17:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 17:35 [PATCH 00/16] Orion DT conversions and fixes Andrew Lunn
2012-07-20 17:35 ` [PATCH 1/16] ARM: Orion: DT support for IRQ and GPIO Controllers Andrew Lunn
2012-07-20 17:35 ` [PATCH 2/16] SPI: Refactor spi-orion to use SPI framework queue Andrew Lunn
2012-07-22 7:22 ` Linus Walleij
2012-07-22 9:53 ` Andrew Lunn
2012-07-22 19:07 ` Mark Brown
2012-07-22 19:32 ` Andrew Lunn
2012-07-22 22:42 ` Mark Brown
2012-07-23 7:27 ` Andrew Lunn
2012-07-23 9:37 ` Mark Brown
2012-07-23 10:08 ` [PATCH] spi-orion: add device tree binding Andrew Lunn
2012-07-23 10:43 ` Mark Brown
2012-07-23 10:59 ` Andrew Lunn
2012-07-23 11:12 ` Mark Brown
2012-07-23 17:43 ` Arnd Bergmann
2012-07-23 10:44 ` Mark Brown
2012-07-23 10:50 ` Andrew Lunn
2012-07-23 10:16 ` [PATCH 2/16] SPI: Refactor spi-orion to use SPI framework queue Andrew Lunn
2012-07-23 10:23 ` Mark Brown
2012-07-23 10:49 ` Andrew Lunn
2012-07-23 11:11 ` Mark Brown
2012-07-23 10:53 ` Sergei Shtylyov
2012-07-23 11:02 ` Andrew Lunn
2012-07-20 17:35 ` [PATCH 3/16] ARM: Kirkwood: Ensure runit clock always ticks Andrew Lunn
2012-07-20 17:35 ` [PATCH 4/16] ARM: Orion: Add arch support needed for I2C via DT Andrew Lunn
2012-07-20 17:35 ` [PATCH 5/16] Kirkwood: Add basic device tree support for QNAP TS219 Andrew Lunn
2012-07-20 17:35 ` [PATCH 6/16] ARM: Orion: DTify the watchdog timer Andrew Lunn
2012-07-20 17:35 ` [PATCH 7/16] ATA: sata_mv: Add device tree support Andrew Lunn
2012-07-20 17:35 ` [PATCH 8/16] ARM: Kirkwood: Use DT to configure SATA device Andrew Lunn
2012-07-20 17:35 ` [PATCH 9/16] ARM: Kirkwood: Describe DNS325 temperature sensor in DT Andrew Lunn
2012-07-20 17:35 ` [PATCH 10/16] ARM: Kirkwood: Describe IB62x0 gpio-keys " Andrew Lunn
2012-07-20 17:35 ` [PATCH 11/16] ARM: Kirkwood: Describe iConnects temperature sensor " Andrew Lunn
2012-07-20 17:35 ` [PATCH 12/16] ARM: Kirkwood: Describe Dreamplug LEDs " Andrew Lunn
2012-07-20 17:35 ` Andrew Lunn [this message]
2012-07-20 17:35 ` [PATCH 14/16] ARM: Kirkwood: Describe ib62x0 " Andrew Lunn
2012-07-20 17:35 ` [PATCH 15/16] ARM: Kirkwood: Describe iConnect " Andrew Lunn
2012-07-30 21:35 ` Adam Baker
2012-07-31 6:36 ` Andrew Lunn
2012-07-31 7:08 ` Arnaud Patard (Rtp)
2012-07-31 7:20 ` Andrew Lunn
2012-07-31 8:59 ` Arnaud Patard (Rtp)
2012-07-20 17:35 ` [PATCH 16/16] ARM: Kirkwood: Replace mrvl with marvell Andrew Lunn
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=1342805751-18048-14-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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).