at91: ohci-at91: always provide all the clocks

[pandora-kernel.git] / drivers / usb / host / ohci-at91.c

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 944291e..e08cb10 100644 (file)
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -35,8 +35,7 @@ extern int usb_disabled(void);
 
 static void at91_start_clock(void)
 {
-       if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
-               clk_enable(hclk);
+       clk_enable(hclk);
        clk_enable(iclk);
        clk_enable(fclk);
        clocked = 1;
@@ -46,8 +45,7 @@ static void at91_stop_clock(void)
 {
        clk_disable(fclk);
        clk_disable(iclk);
-       if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
-               clk_disable(hclk);
+       clk_disable(hclk);
        clocked = 0;
 }
 
@@ -142,8 +140,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
 
        iclk = clk_get(&pdev->dev, "ohci_clk");
        fclk = clk_get(&pdev->dev, "uhpck");
-       if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
-               hclk = clk_get(&pdev->dev, "hck0");
+       hclk = clk_get(&pdev->dev, "hclk");
 
        at91_start_hc(pdev);
        ohci_hcd_init(hcd_to_ohci(hcd));
@@ -155,8 +152,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
        /* Error handling */
        at91_stop_hc(pdev);
 
-       if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
-               clk_put(hclk);
+       clk_put(hclk);
        clk_put(fclk);
        clk_put(iclk);
 
@@ -192,8 +188,7 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
        usb_put_hcd(hcd);
 
-       if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
-               clk_put(hclk);
+       clk_put(hclk);
        clk_put(fclk);
        clk_put(iclk);
        fclk = iclk = hclk = NULL;