* [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute
@ 2011-07-05 9:05 Thomas Petazzoni
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-05 9:05 UTC (permalink / raw)
To: linux-arm-kernel
The existing OHCI AT91 driver made the assumption that the enable
input of the USB power switch was active low. However, some USB power
switches such as the Micrel MIC2026-1 [1] have an active high input to
enable the power. A new vbus_pin_inverted attribute is added to the
at91_usbh_data structure so that board files can tell the OHCI driver
if the vbus pin logic is active low or active high.
[1] http://www.micrel.com/page.do?page=product-info/products/mic2026.shtml
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/include/mach/board.h | 1 +
drivers/usb/host/ohci-at91.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index ed544a0..61d52dc 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -98,6 +98,7 @@ extern void __init at91_add_device_eth(struct at91_eth_data *data);
struct at91_usbh_data {
u8 ports; /* number of ports on root hub */
u8 vbus_pin[2]; /* port power-control pin */
+ u8 vbus_pin_inverted;
};
extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 944291e..52e50ba 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -284,7 +284,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
if (pdata->vbus_pin[i] <= 0)
continue;
gpio_request(pdata->vbus_pin[i], "ohci_vbus");
- gpio_direction_output(pdata->vbus_pin[i], 0);
+ gpio_direction_output(pdata->vbus_pin[i], 0 ^ pdata->vbus_pin_inverted);
}
}
@@ -301,7 +301,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
if (pdata->vbus_pin[i] <= 0)
continue;
- gpio_direction_output(pdata->vbus_pin[i], 1);
+ gpio_direction_output(pdata->vbus_pin[i], 1 ^ pdata->vbus_pin_inverted);
gpio_free(pdata->vbus_pin[i]);
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] at91-ohci: support overcurrent notification
2011-07-05 9:05 [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
@ 2011-07-05 9:05 ` Thomas Petazzoni
2011-07-05 10:12 ` Matthieu CASTET
2011-07-05 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-05 9:05 ` [PATCH 3/3] at91-ohci: configure overcurrent pins as GPIOs Thomas Petazzoni
2011-07-05 11:39 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Sergei Shtylyov
2 siblings, 2 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-05 9:05 UTC (permalink / raw)
To: linux-arm-kernel
Several USB power switches (AIC1526 or MIC2026) have a digital output
that is used to notify that an overcurrent situation is taking
place. This digital outputs are typically connected to GPIO inputs of
the processor and can be used to be notified of those overcurrent
situations.
Therefore, we add a new overcurrent_pin[] array in the at91_usbh_data
structure so that boards can tell the AT91 OHCI driver which pins are
used for the overcurrent notification. The AT91 OHCI driver simply
registers an interrupt handler which will log the entry and exit of an
overcurrent situation in the kernel logs.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/include/mach/board.h | 1 +
drivers/usb/host/ohci-at91.c | 37 +++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index 61d52dc..1f90d79 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -99,6 +99,7 @@ struct at91_usbh_data {
u8 ports; /* number of ports on root hub */
u8 vbus_pin[2]; /* port power-control pin */
u8 vbus_pin_inverted;
+ u8 overcurrent_pin[2]; /* over-current signal pins */
};
extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 52e50ba..2801c77 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -269,6 +269,19 @@ static const struct hc_driver ohci_at91_hc_driver = {
/*-------------------------------------------------------------------------*/
+static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
+{
+ struct platform_device *pdev = data;
+ int val;
+
+ val = gpio_get_value(irq_to_gpio(irq));
+ dev_err(& pdev->dev, "overcurrent situation %s\n",
+ val ? "exited" : "notified");
+ return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
{
struct at91_usbh_data *pdata = pdev->dev.platform_data;
@@ -286,6 +299,23 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
gpio_request(pdata->vbus_pin[i], "ohci_vbus");
gpio_direction_output(pdata->vbus_pin[i], 0 ^ pdata->vbus_pin_inverted);
}
+
+ for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
+ int ret;
+
+ if (pdata->overcurrent_pin[i] <= 0)
+ continue;
+ gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
+ gpio_direction_input(pdata->overcurrent_pin[i]);
+
+ ret = request_irq(gpio_to_irq(pdata->overcurrent_pin[i]),
+ ohci_hcd_at91_overcurrent_irq,
+ IRQF_SHARED, "ohci_overcurrent", pdev);
+ if (ret) {
+ gpio_free(pdata->overcurrent_pin[i]);
+ dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
+ }
+ }
}
device_init_wakeup(&pdev->dev, 1);
@@ -304,6 +334,13 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
gpio_direction_output(pdata->vbus_pin[i], 1 ^ pdata->vbus_pin_inverted);
gpio_free(pdata->vbus_pin[i]);
}
+
+ for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
+ if (pdata->overcurrent_pin[i] <= 0)
+ continue;
+ free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
+ gpio_free(pdata->overcurrent_pin[i]);
+ }
}
device_init_wakeup(&pdev->dev, 0);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] at91-ohci: configure overcurrent pins as GPIOs
2011-07-05 9:05 [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
@ 2011-07-05 9:05 ` Thomas Petazzoni
2011-07-05 11:39 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Sergei Shtylyov
2 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-05 9:05 UTC (permalink / raw)
To: linux-arm-kernel
As a new overcurrent_pin[] array has been added to the at91_usbh_data
structure, those pins must be muxed to work properly. This commit
implements this muxing for all AT91 SoCs that support the AT91 OHCI.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/at91cap9_devices.c | 5 +++++
arch/arm/mach-at91/at91rm9200_devices.c | 5 +++++
arch/arm/mach-at91/at91sam9260_devices.c | 5 +++++
arch/arm/mach-at91/at91sam9261_devices.c | 5 +++++
arch/arm/mach-at91/at91sam9263_devices.c | 5 +++++
arch/arm/mach-at91/at91sam9g45_devices.c | 5 +++++
6 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index dba0d8d..db7173a 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -80,6 +80,11 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
at91_set_gpio_output(data->vbus_pin[i], 0);
}
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_data = *data;
platform_device_register(&at91_usbh_device);
}
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 7227755..6a1d564 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -63,6 +63,11 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
if (!data)
return;
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_data = *data;
platform_device_register(&at91rm9200_usbh_device);
}
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 39f81f4..3a77508 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -64,6 +64,11 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
if (!data)
return;
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_data = *data;
platform_device_register(&at91_usbh_device);
}
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 5004bf0..57b3fa7 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -67,6 +67,11 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
if (!data)
return;
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_data = *data;
platform_device_register(&at91sam9261_usbh_device);
}
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index a050f41..f0fcc93 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -74,6 +74,11 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
at91_set_gpio_output(data->vbus_pin[i], 0);
}
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_data = *data;
platform_device_register(&at91_usbh_device);
}
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 600bffb..4f2d774 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -124,6 +124,11 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data)
at91_set_gpio_output(data->vbus_pin[i], 0);
}
+ for (i = 0; i < data->ports; i++) {
+ if (data->overcurrent_pin[i])
+ at91_set_GPIO_periph(data->overcurrent_pin[i], 1);
+ }
+
usbh_ohci_data = *data;
platform_device_register(&at91_usbh_ohci_device);
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] at91-ohci: support overcurrent notification
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
@ 2011-07-05 10:12 ` Matthieu CASTET
2011-07-05 10:18 ` Thomas Petazzoni
2011-07-05 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 1 reply; 11+ messages in thread
From: Matthieu CASTET @ 2011-07-05 10:12 UTC (permalink / raw)
To: linux-arm-kernel
Thomas Petazzoni a ?crit :
> Several USB power switches (AIC1526 or MIC2026) have a digital output
> that is used to notify that an overcurrent situation is taking
> place. This digital outputs are typically connected to GPIO inputs of
> the processor and can be used to be notified of those overcurrent
> situations.
>
> Therefore, we add a new overcurrent_pin[] array in the at91_usbh_data
> structure so that boards can tell the AT91 OHCI driver which pins are
> used for the overcurrent notification. The AT91 OHCI driver simply
> registers an interrupt handler which will log the entry and exit of an
> overcurrent situation in the kernel logs.
>
Why don't you forward the overcurrent notification to the usb stack ?
A printk is quite useless.
Matthieu
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] at91-ohci: support overcurrent notification
2011-07-05 10:12 ` Matthieu CASTET
@ 2011-07-05 10:18 ` Thomas Petazzoni
2011-07-05 12:18 ` Matthieu CASTET
0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-05 10:18 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
Le Tue, 5 Jul 2011 12:12:54 +0200,
Matthieu CASTET <matthieu.castet@parrot.com> a ?crit :
> Why don't you forward the overcurrent notification to the usb stack ?
> A printk is quite useless.
Do you have a pointer to the appropriate functions/mechanisms of the
USB stack about this ?
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute
2011-07-05 9:05 [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
2011-07-05 9:05 ` [PATCH 3/3] at91-ohci: configure overcurrent pins as GPIOs Thomas Petazzoni
@ 2011-07-05 11:39 ` Sergei Shtylyov
2011-07-05 11:54 ` Thomas Petazzoni
2 siblings, 1 reply; 11+ messages in thread
From: Sergei Shtylyov @ 2011-07-05 11:39 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 05-07-2011 13:05, Thomas Petazzoni wrote:
> The existing OHCI AT91 driver made the assumption that the enable
> input of the USB power switch was active low. However, some USB power
> switches such as the Micrel MIC2026-1 [1] have an active high input to
> enable the power. A new vbus_pin_inverted attribute is added to the
> at91_usbh_data structure so that board files can tell the OHCI driver
> if the vbus pin logic is active low or active high.
> [1] http://www.micrel.com/page.do?page=product-info/products/mic2026.shtml
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> Cc: Andrew Victor<linux@maxim.org.za>
> Cc: Nicolas Ferre<nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard<plagnioj@jcrosoft.com>
[...]
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 944291e..52e50ba 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -284,7 +284,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
> if (pdata->vbus_pin[i]<= 0)
> continue;
> gpio_request(pdata->vbus_pin[i], "ohci_vbus");
> - gpio_direction_output(pdata->vbus_pin[i], 0);
> + gpio_direction_output(pdata->vbus_pin[i], 0 ^ pdata->vbus_pin_inverted);
Why not simply 'pdata->vbus_pin_inverted'?
> }
> }
>
> @@ -301,7 +301,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
> for (i = 0; i< ARRAY_SIZE(pdata->vbus_pin); i++) {
> if (pdata->vbus_pin[i]<= 0)
> continue;
> - gpio_direction_output(pdata->vbus_pin[i], 1);
> + gpio_direction_output(pdata->vbus_pin[i], 1 ^ pdata->vbus_pin_inverted);
Why not simply '!pdata->vbus_pin_inverted'?
WBR, Sergei
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute
2011-07-05 11:39 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Sergei Shtylyov
@ 2011-07-05 11:54 ` Thomas Petazzoni
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-05 11:54 UTC (permalink / raw)
To: linux-arm-kernel
Le Tue, 05 Jul 2011 15:39:18 +0400,
Sergei Shtylyov <sshtylyov@mvista.com> a ?crit :
> > - gpio_direction_output(pdata->vbus_pin[i], 0);
> > + gpio_direction_output(pdata->vbus_pin[i], 0 ^ pdata->vbus_pin_inverted);
>
> Why not simply 'pdata->vbus_pin_inverted'?
> > - gpio_direction_output(pdata->vbus_pin[i], 1);
> > + gpio_direction_output(pdata->vbus_pin[i], 1 ^ pdata->vbus_pin_inverted);
>
> Why not simply '!pdata->vbus_pin_inverted'?
Ah, correct. The 0 and 1 were present before, and I just wanted to xor
them with vbus_pin_inverted, but obviously, there's a simpler way of
writing things, as you suggest.
I'll update my patch and send a new version after gathering comments
from other reviewers.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] at91-ohci: support overcurrent notification
2011-07-05 10:18 ` Thomas Petazzoni
@ 2011-07-05 12:18 ` Matthieu CASTET
0 siblings, 0 replies; 11+ messages in thread
From: Matthieu CASTET @ 2011-07-05 12:18 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
Thomas Petazzoni a ?crit :
> Hello,
>
> Le Tue, 5 Jul 2011 12:12:54 +0200,
> Matthieu CASTET <matthieu.castet@parrot.com> a ?crit :
>
>> Why don't you forward the overcurrent notification to the usb stack ?
>> A printk is quite useless.
>
> Do you have a pointer to the appropriate functions/mechanisms of the
> USB stack about this ?
For ohci you have to override hub_status_data and hub_control callback.
You can look how it is done in ohci-da8xx.c / ohci-s3c2410.c driver.
May be (or not) it could be useful to introduce a generic function to do all the
parsing stuff.
Matthieu
PS : Add linux-usb to CC
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] at91-ohci: support overcurrent notification
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
2011-07-05 10:12 ` Matthieu CASTET
@ 2011-07-05 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 11+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-07-05 14:23 UTC (permalink / raw)
To: linux-arm-kernel
On 11:05 Tue 05 Jul , Thomas Petazzoni wrote:
> Several USB power switches (AIC1526 or MIC2026) have a digital output
> that is used to notify that an overcurrent situation is taking
> place. This digital outputs are typically connected to GPIO inputs of
> the processor and can be used to be notified of those overcurrent
> situations.
>
> Therefore, we add a new overcurrent_pin[] array in the at91_usbh_data
> structure so that boards can tell the AT91 OHCI driver which pins are
> used for the overcurrent notification. The AT91 OHCI driver simply
> registers an interrupt handler which will log the entry and exit of an
> overcurrent situation in the kernel logs.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Andrew Victor <linux@maxim.org.za>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> ---
> arch/arm/mach-at91/include/mach/board.h | 1 +
> drivers/usb/host/ohci-at91.c | 37 +++++++++++++++++++++++++++++++
> 2 files changed, 38 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> index 61d52dc..1f90d79 100644
> --- a/arch/arm/mach-at91/include/mach/board.h
> +++ b/arch/arm/mach-at91/include/mach/board.h
> @@ -99,6 +99,7 @@ struct at91_usbh_data {
> u8 ports; /* number of ports on root hub */
> u8 vbus_pin[2]; /* port power-control pin */
> u8 vbus_pin_inverted;
> + u8 overcurrent_pin[2]; /* over-current signal pins */
please use named resourcees and provide the irq number
Best Regards,
J.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute
2011-07-13 9:29 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
@ 2011-09-07 10:47 ` Nicolas Ferre
0 siblings, 0 replies; 11+ messages in thread
From: Nicolas Ferre @ 2011-09-07 10:47 UTC (permalink / raw)
To: linux-arm-kernel
Le 13/07/2011 11:29, Thomas Petazzoni :
> The existing OHCI AT91 driver made the assumption that the enable
> input of the USB power switch was active low. However, some USB power
> switches such as the Micrel MIC2026-1 [1] have an active high input to
> enable the power. A new vbus_pin_inverted attribute is added to the
> at91_usbh_data structure so that board files can tell the OHCI driver
> if the vbus pin logic is active low or active high.
>
> [1] http://www.micrel.com/page.do?page=product-info/products/mic2026.shtml
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Andrew Victor <linux@maxim.org.za>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> ---
> arch/arm/mach-at91/include/mach/board.h | 1 +
> drivers/usb/host/ohci-at91.c | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> index ed544a0..61d52dc 100644
> --- a/arch/arm/mach-at91/include/mach/board.h
> +++ b/arch/arm/mach-at91/include/mach/board.h
> @@ -98,6 +98,7 @@ extern void __init at91_add_device_eth(struct at91_eth_data *data);
> struct at91_usbh_data {
> u8 ports; /* number of ports on root hub */
> u8 vbus_pin[2]; /* port power-control pin */
> + u8 vbus_pin_inverted;
> };
> extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
> extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 944291e..3612ccd 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -284,7 +284,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
> if (pdata->vbus_pin[i] <= 0)
> continue;
> gpio_request(pdata->vbus_pin[i], "ohci_vbus");
> - gpio_direction_output(pdata->vbus_pin[i], 0);
> + gpio_direction_output(pdata->vbus_pin[i], pdata->vbus_pin_inverted);
> }
> }
>
> @@ -301,7 +301,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
> for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
> if (pdata->vbus_pin[i] <= 0)
> continue;
> - gpio_direction_output(pdata->vbus_pin[i], 1);
> + gpio_direction_output(pdata->vbus_pin[i], !pdata->vbus_pin_inverted);
> gpio_free(pdata->vbus_pin[i]);
> }
> }
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute
2011-07-13 9:29 [PATCH v2] AT91 OHCI active-high vbus and overcurrent handling Thomas Petazzoni
@ 2011-07-13 9:29 ` Thomas Petazzoni
2011-09-07 10:47 ` Nicolas Ferre
0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2011-07-13 9:29 UTC (permalink / raw)
To: linux-arm-kernel
The existing OHCI AT91 driver made the assumption that the enable
input of the USB power switch was active low. However, some USB power
switches such as the Micrel MIC2026-1 [1] have an active high input to
enable the power. A new vbus_pin_inverted attribute is added to the
at91_usbh_data structure so that board files can tell the OHCI driver
if the vbus pin logic is active low or active high.
[1] http://www.micrel.com/page.do?page=product-info/products/mic2026.shtml
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/include/mach/board.h | 1 +
drivers/usb/host/ohci-at91.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index ed544a0..61d52dc 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -98,6 +98,7 @@ extern void __init at91_add_device_eth(struct at91_eth_data *data);
struct at91_usbh_data {
u8 ports; /* number of ports on root hub */
u8 vbus_pin[2]; /* port power-control pin */
+ u8 vbus_pin_inverted;
};
extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 944291e..3612ccd 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -284,7 +284,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
if (pdata->vbus_pin[i] <= 0)
continue;
gpio_request(pdata->vbus_pin[i], "ohci_vbus");
- gpio_direction_output(pdata->vbus_pin[i], 0);
+ gpio_direction_output(pdata->vbus_pin[i], pdata->vbus_pin_inverted);
}
}
@@ -301,7 +301,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
if (pdata->vbus_pin[i] <= 0)
continue;
- gpio_direction_output(pdata->vbus_pin[i], 1);
+ gpio_direction_output(pdata->vbus_pin[i], !pdata->vbus_pin_inverted);
gpio_free(pdata->vbus_pin[i]);
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-09-07 10:47 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-05 9:05 [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
2011-07-05 9:05 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
2011-07-05 10:12 ` Matthieu CASTET
2011-07-05 10:18 ` Thomas Petazzoni
2011-07-05 12:18 ` Matthieu CASTET
2011-07-05 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-05 9:05 ` [PATCH 3/3] at91-ohci: configure overcurrent pins as GPIOs Thomas Petazzoni
2011-07-05 11:39 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Sergei Shtylyov
2011-07-05 11:54 ` Thomas Petazzoni
2011-07-13 9:29 [PATCH v2] AT91 OHCI active-high vbus and overcurrent handling Thomas Petazzoni
2011-07-13 9:29 ` [PATCH 1/3] ohci-at91: add vbus_pin_inverted platform attribute Thomas Petazzoni
2011-09-07 10:47 ` Nicolas Ferre
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.