All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] omap3: Fix EHCI port for IGEP v2 board.
@ 2010-03-01 11:18 Enric Balletbo i Serra
  2010-03-01 11:18 ` [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs on " Enric Balletbo i Serra
  2010-03-11 22:04 ` [PATCH] omap3: Fix EHCI port for IGEP v2 board Tony Lindgren
  0 siblings, 2 replies; 4+ messages in thread
From: Enric Balletbo i Serra @ 2010-03-01 11:18 UTC (permalink / raw)
  To: linux-omap; +Cc: Enric Balletbo i Serra

From: Enric Balletbo i Serra <eballetbo@iseebcn.com>

IGEP v2 uses EHCI port 1 instead of EHCI port 2.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
---
 arch/arm/mach-omap2/board-igep0020.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 9958987..26f65ca 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -443,13 +443,13 @@ static struct omap_musb_board_data musb_board_data = {
 };
 
 static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+	.port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
 	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
 
 	.phy_reset = true,
-	.reset_gpio_port[0] = -EINVAL,
-	.reset_gpio_port[1] = IGEP2_GPIO_USBH_NRESET,
+	.reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET,
+	.reset_gpio_port[1] = -EINVAL,
 	.reset_gpio_port[2] = -EINVAL,
 };
 
-- 
1.5.4.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2 board.
  2010-03-01 11:18 [PATCH] omap3: Fix EHCI port for IGEP v2 board Enric Balletbo i Serra
@ 2010-03-01 11:18 ` Enric Balletbo i Serra
  2010-03-11 22:05   ` [APPLIED] [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs Tony Lindgren
  2010-03-11 22:04 ` [PATCH] omap3: Fix EHCI port for IGEP v2 board Tony Lindgren
  1 sibling, 1 reply; 4+ messages in thread
From: Enric Balletbo i Serra @ 2010-03-01 11:18 UTC (permalink / raw)
  To: linux-omap; +Cc: Enric Balletbo i Serra

From: Enric Balletbo i Serra <eballetbo@iseebcn.com>

Select CONFIG_LEDS_GPIO to enable IGEP v2 LED support and control of supported
LEDs from userspace. Otherwise GPIO LEDs are exported as GPIO 26, 27 and 28 using
the gpiolib framework.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
---
 arch/arm/mach-omap2/board-igep0020.c |   54 ++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 26f65ca..19aaff0 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -16,7 +16,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <linux/leds.h>
 #include <linux/interrupt.h>
 
 #include <linux/regulator/machine.h>
@@ -39,8 +38,8 @@
 #define IGEP2_SMSC911X_CS       5
 #define IGEP2_SMSC911X_GPIO     176
 #define IGEP2_GPIO_USBH_NRESET  24
-#define IGEP2_GPIO_LED0_RED 	26
-#define IGEP2_GPIO_LED0_GREEN 	27
+#define IGEP2_GPIO_LED0_GREEN 	26
+#define IGEP2_GPIO_LED0_RED 	27
 #define IGEP2_GPIO_LED1_RED   	28
 #define IGEP2_GPIO_DVI_PUP	170
 #define IGEP2_GPIO_WIFI_NPD 	94
@@ -355,34 +354,50 @@ static void __init igep2_display_init(void)
 	    gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1))
 		pr_err("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n");
 }
-#ifdef CONFIG_LEDS_TRIGGERS
-static struct gpio_led gpio_leds[] = {
+
+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
+#include <linux/leds.h>
+
+static struct gpio_led igep2_gpio_leds[] = {
 	{
-		.name = "GPIO_LED1_RED",
+		.name = "led0:red",
+		.gpio = IGEP2_GPIO_LED0_RED,
+	},
+	{
+		.name = "led0:green",
 		.default_trigger = "heartbeat",
+		.gpio = IGEP2_GPIO_LED0_GREEN,
+	},
+	{
+		.name = "led1:red",
 		.gpio = IGEP2_GPIO_LED1_RED,
 	},
 };
 
-static struct gpio_led_platform_data gpio_leds_info = {
-	.leds           = gpio_leds,
-	.num_leds       = ARRAY_SIZE(gpio_leds),
+static struct gpio_led_platform_data igep2_led_pdata = {
+	.leds           = igep2_gpio_leds,
+	.num_leds       = ARRAY_SIZE(igep2_gpio_leds),
 };
 
-static struct platform_device leds_gpio = {
+static struct platform_device igep2_led_device = {
 	 .name   = "leds-gpio",
 	 .id     = -1,
 	 .dev    = {
-		 .platform_data  =  &gpio_leds_info,
+		 .platform_data  =  &igep2_led_pdata,
 	},
 };
+
+static void __init igep2_init_led(void)
+{
+	platform_device_register(&igep2_led_device);
+}
+
+#else
+static inline void igep2_init_led(void) {}
 #endif
 
 static struct platform_device *igep2_devices[] __initdata = {
 	&igep2_dss_device,
-#ifdef CONFIG_LEDS_TRIGGERS
-	&leds_gpio,
-#endif
 };
 
 static void __init igep2_init_irq(void)
@@ -471,31 +486,34 @@ static void __init igep2_init(void)
 	usb_ehci_init(&ehci_pdata);
 
 	igep2_flash_init();
+	igep2_init_led();
 	igep2_display_init();
 	igep2_init_smsc911x();
 
 	/* GPIO userspace leds */
-	if ((gpio_request(IGEP2_GPIO_LED0_RED, "GPIO_LED0_RED") == 0) &&
+#if !defined(CONFIG_LEDS_GPIO) && !defined(CONFIG_LEDS_GPIO_MODULE)
+	if ((gpio_request(IGEP2_GPIO_LED0_RED, "led0:red") == 0) &&
 	    (gpio_direction_output(IGEP2_GPIO_LED0_RED, 1) == 0)) {
 		gpio_export(IGEP2_GPIO_LED0_RED, 0);
 		gpio_set_value(IGEP2_GPIO_LED0_RED, 0);
 	} else
 		pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_RED\n");
 
-	if ((gpio_request(IGEP2_GPIO_LED0_GREEN, "GPIO_LED0_GREEN") == 0) &&
+	if ((gpio_request(IGEP2_GPIO_LED0_GREEN, "led0:green") == 0) &&
 	    (gpio_direction_output(IGEP2_GPIO_LED0_GREEN, 1) == 0)) {
 		gpio_export(IGEP2_GPIO_LED0_GREEN, 0);
 		gpio_set_value(IGEP2_GPIO_LED0_GREEN, 0);
 	} else
 		pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n");
-#ifndef CONFIG_LEDS_TRIGGERS
-	if ((gpio_request(IGEP2_GPIO_LED1_RED, "GPIO_LED1_RED") == 0) &&
+
+	if ((gpio_request(IGEP2_GPIO_LED1_RED, "led1:red") == 0) &&
 	    (gpio_direction_output(IGEP2_GPIO_LED1_RED, 1) == 0)) {
 		gpio_export(IGEP2_GPIO_LED1_RED, 0);
 		gpio_set_value(IGEP2_GPIO_LED1_RED, 0);
 	} else
 		pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n");
 #endif
+
 	/* GPIO W-LAN + Bluetooth combo module */
 	if ((gpio_request(IGEP2_GPIO_WIFI_NPD, "GPIO_WIFI_NPD") == 0) &&
 	    (gpio_direction_output(IGEP2_GPIO_WIFI_NPD, 1) == 0)) {
-- 
1.5.4.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] omap3: Fix EHCI port for IGEP v2 board.
  2010-03-01 11:18 [PATCH] omap3: Fix EHCI port for IGEP v2 board Enric Balletbo i Serra
  2010-03-01 11:18 ` [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs on " Enric Balletbo i Serra
@ 2010-03-11 22:04 ` Tony Lindgren
  1 sibling, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2010-03-11 22:04 UTC (permalink / raw)
  To: Enric Balletbo i Serra; +Cc: linux-omap, Enric Balletbo i Serra

* Enric Balletbo i Serra <eballetbo@gmail.com> [100303 09:34]:
> From: Enric Balletbo i Serra <eballetbo@iseebcn.com>
> 
> IGEP v2 uses EHCI port 1 instead of EHCI port 2.

This does not seem to apply, can you please refresh please?

Tony
 
> Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
> ---
>  arch/arm/mach-omap2/board-igep0020.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> index 9958987..26f65ca 100644
> --- a/arch/arm/mach-omap2/board-igep0020.c
> +++ b/arch/arm/mach-omap2/board-igep0020.c
> @@ -443,13 +443,13 @@ static struct omap_musb_board_data musb_board_data = {
>  };
>  
>  static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
> -	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
> -	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
> +	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
> +	.port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
>  	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
>  
>  	.phy_reset = true,
> -	.reset_gpio_port[0] = -EINVAL,
> -	.reset_gpio_port[1] = IGEP2_GPIO_USBH_NRESET,
> +	.reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET,
> +	.reset_gpio_port[1] = -EINVAL,
>  	.reset_gpio_port[2] = -EINVAL,
>  };
>  
> -- 
> 1.5.4.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [APPLIED] [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs
  2010-03-01 11:18 ` [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs on " Enric Balletbo i Serra
@ 2010-03-11 22:05   ` Tony Lindgren
  0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2010-03-11 22:05 UTC (permalink / raw)
  To: linux-omap

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-fixes

Initial commit ID (Likely to change): 0ce147cb24d1371ccc49e962af7648fa7a5d9196

PatchWorks
http://patchwork.kernel.org/patch/83403/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=0ce147cb24d1371ccc49e962af7648fa7a5d9196



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-11 22:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-01 11:18 [PATCH] omap3: Fix EHCI port for IGEP v2 board Enric Balletbo i Serra
2010-03-01 11:18 ` [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs on " Enric Balletbo i Serra
2010-03-11 22:05   ` [APPLIED] [PATCH] omap3: Fix support for the LEDs connected to GPIO outputs Tony Lindgren
2010-03-11 22:04 ` [PATCH] omap3: Fix EHCI port for IGEP v2 board Tony Lindgren

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.