* [PATCH 1/2] usb: at91: fix clk_get error handling
@ 2011-12-08 15:32 Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 15:32 ` [PATCH 2/2] ARM: at91: usb ohci rename vbus_pin_inverted to vbus_pin_active_low Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 23:49 ` [PATCH 1/2] usb: at91: fix clk_get error handling Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-08 15:32 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: linux-usb at vger.kernel.org
---
Hi,
can we apply via at91 as it's depend on patch already on arm-soc
Best Regarfds,
J.
drivers/usb/host/ohci-at91.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 5df0b0e..dc33517 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -139,8 +139,23 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
}
iclk = clk_get(&pdev->dev, "ohci_clk");
+ if (IS_ERR(iclk)) {
+ dev_err(&pdev->dev, "failed to get ohci_clk\n");
+ retval = PTR_ERR(iclk);
+ goto err3;
+ }
fclk = clk_get(&pdev->dev, "uhpck");
+ if (IS_ERR(fclk)) {
+ dev_err(&pdev->dev, "failed to get uhpck\n");
+ retval = PTR_ERR(fclk);
+ goto err4;
+ }
hclk = clk_get(&pdev->dev, "hclk");
+ if (IS_ERR(hclk)) {
+ dev_err(&pdev->dev, "failed to get hclk\n");
+ retval = PTR_ERR(hclk);
+ goto err5;
+ }
at91_start_hc(pdev);
ohci_hcd_init(hcd_to_ohci(hcd));
@@ -153,9 +168,12 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
at91_stop_hc(pdev);
clk_put(hclk);
+ err5:
clk_put(fclk);
+ err4:
clk_put(iclk);
+ err3:
iounmap(hcd->regs);
err2:
--
1.7.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] ARM: at91: usb ohci rename vbus_pin_inverted to vbus_pin_active_low
2011-12-08 15:32 [PATCH 1/2] usb: at91: fix clk_get error handling Jean-Christophe PLAGNIOL-VILLARD
@ 2011-12-08 15:32 ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 23:49 ` [PATCH 1/2] usb: at91: fix clk_get error handling Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-08 15:32 UTC (permalink / raw)
To: linux-arm-kernel
as everywhere else and allow to configure independently each vbus_pin
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: linux-usb at vger.kernel.org
---
Hi,
can we apply via at91 as it's depend on patch already on arm-soc
Best Regarfds,
J.
arch/arm/mach-at91/include/mach/board.h | 2 +-
drivers/usb/host/ohci-at91.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index d0b377b..3b33f07 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -88,7 +88,7 @@ extern void __init at91_add_device_eth(struct macb_platform_data *data);
struct at91_usbh_data {
u8 ports; /* number of ports on root hub */
int vbus_pin[2]; /* port power-control pin */
- u8 vbus_pin_inverted;
+ u8 vbus_pin_active_low[2];
u8 overcurrent_supported;
int overcurrent_pin[2];
u8 overcurrent_status[2];
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index dc33517..77afabc 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -244,7 +244,8 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
if (!gpio_is_valid(pdata->vbus_pin[port]))
return;
- gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable);
+ gpio_set_value(pdata->vbus_pin[port],
+ !pdata->vbus_pin_active_low[port] ^ enable);
}
static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -255,7 +256,8 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
if (!gpio_is_valid(pdata->vbus_pin[port]))
return -EINVAL;
- return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted;
+ return gpio_get_value(pdata->vbus_pin[port]) ^
+ !pdata->vbus_pin_active_low[port];
}
/*
--
1.7.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 1/2] usb: at91: fix clk_get error handling
2011-12-08 15:32 [PATCH 1/2] usb: at91: fix clk_get error handling Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 15:32 ` [PATCH 2/2] ARM: at91: usb ohci rename vbus_pin_inverted to vbus_pin_active_low Jean-Christophe PLAGNIOL-VILLARD
@ 2011-12-09 23:49 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-12-09 23:49 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 08, 2011 at 04:32:00PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: linux-usb at vger.kernel.org
> ---
> Hi,
>
> can we apply via at91 as it's depend on patch already on arm-soc
That's fine with me, feel free to add:
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to both of these patches and take them through the arm-soc tree.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-09 23:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-08 15:32 [PATCH 1/2] usb: at91: fix clk_get error handling Jean-Christophe PLAGNIOL-VILLARD
2011-12-08 15:32 ` [PATCH 2/2] ARM: at91: usb ohci rename vbus_pin_inverted to vbus_pin_active_low Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 23:49 ` [PATCH 1/2] usb: at91: fix clk_get error handling Greg KH
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.