From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] at91-ohci: configure overcurrent pins as input GPIOs
Date: Wed, 07 Sep 2011 15:16:20 +0200 [thread overview]
Message-ID: <4E676EA4.1040406@atmel.com> (raw)
In-Reply-To: <4E674CA4.6080506@atmel.com>
Le 07/09/2011 12:51, Nicolas Ferre :
> Le 13/07/2011 11:29, Thomas Petazzoni :
>> 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>
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
but with...
> I will include this patch series in at91-l2 branch on:
> git://github.com/at91linux/linux-at91.git
> (mind the removal of -2.6-)
>
> But there are several changes to ohci-at91 which also may fit in an USB
> git tree...
> According to the nature of changes, I think it is better to send them
> upstream through the AT91 - arm-soc flow.
>
> Thanks Thomas, best regards,
>
>> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
>> ---
>> arch/arm/mach-at91/at91cap9_devices.c | 6 ++++++
>> arch/arm/mach-at91/at91rm9200_devices.c | 6 ++++++
>> arch/arm/mach-at91/at91sam9260_devices.c | 6 ++++++
>> arch/arm/mach-at91/at91sam9261_devices.c | 6 ++++++
>> arch/arm/mach-at91/at91sam9263_devices.c | 6 ++++++
>> arch/arm/mach-at91/at91sam9g45_devices.c | 6 ++++++
>> 6 files changed, 36 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
>> index dba0d8d..b46615a 100644
>> --- a/arch/arm/mach-at91/at91cap9_devices.c
>> +++ b/arch/arm/mach-at91/at91cap9_devices.c
>> @@ -80,6 +80,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
>> at91_set_gpio_output(data->vbus_pin[i], 0);
>> }
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(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..b2202b6 100644
>> --- a/arch/arm/mach-at91/at91rm9200_devices.c
>> +++ b/arch/arm/mach-at91/at91rm9200_devices.c
>> @@ -63,6 +63,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
>> if (!data)
>> return;
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
Yes, but... Missing "i" declaration... I have added it.
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(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..ad64fc3 100644
>> --- a/arch/arm/mach-at91/at91sam9260_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
>> @@ -64,6 +64,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
>> if (!data)
>> return;
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
Ditto.
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(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..e394e86 100644
>> --- a/arch/arm/mach-at91/at91sam9261_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9261_devices.c
>> @@ -67,6 +67,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
>> if (!data)
>> return;
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
Ditto.
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(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..d4aef76 100644
>> --- a/arch/arm/mach-at91/at91sam9263_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9263_devices.c
>> @@ -74,6 +74,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
>> at91_set_gpio_output(data->vbus_pin[i], 0);
>> }
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
Ok here as we already have an "i"...
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(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..e4a9857 100644
>> --- a/arch/arm/mach-at91/at91sam9g45_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
>> @@ -124,6 +124,12 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data)
>> at91_set_gpio_output(data->vbus_pin[i], 0);
>> }
>>
>> + /* Enable overcurrent notification */
>> + for (i = 0; i < data->ports; i++) {
>> + if (data->overcurrent_pin[i])
>> + at91_set_gpio_input(data->overcurrent_pin[i], 1);
>> + }
>> +
>> usbh_ohci_data = *data;
>> platform_device_register(&at91_usbh_ohci_device);
>> }
>
>
Best regards,
--
Nicolas Ferre
prev parent reply other threads:[~2011-09-07 13:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2011-07-13 9:29 ` [PATCH 2/3] at91-ohci: support overcurrent notification Thomas Petazzoni
2011-07-13 14:28 ` Thomas Petazzoni
2011-07-13 15:54 ` Alan Stern
2011-07-13 16:43 ` Thomas Petazzoni
2011-07-13 17:17 ` Alan Stern
2011-09-07 10:47 ` Nicolas Ferre
2011-07-13 9:29 ` [PATCH 3/3] at91-ohci: configure overcurrent pins as input GPIOs Thomas Petazzoni
2011-09-07 10:51 ` Nicolas Ferre
2011-09-07 13:16 ` Nicolas Ferre [this message]
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=4E676EA4.1040406@atmel.com \
--to=nicolas.ferre@atmel.com \
--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).