drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard

[karo-tx-linux.git] / drivers / usb / host / ehci-atmel.c

diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 66420097c24234eb3db9d09a656345cd80edcc9f..3b645ff46f7b9f8df67d2d793c1758be26173b21 100644 (file)
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -37,15 +37,15 @@ static int clocked;
 
 static void atmel_start_clock(void)
 {
-       clk_enable(iclk);
-       clk_enable(fclk);
+       clk_prepare_enable(iclk);
+       clk_prepare_enable(fclk);
        clocked = 1;
 }
 
 static void atmel_stop_clock(void)
 {
-       clk_disable(fclk);
-       clk_disable(iclk);
+       clk_disable_unprepare(fclk);
+       clk_disable_unprepare(iclk);
        clocked = 0;
 }
 
@@ -63,8 +63,6 @@ static void atmel_stop_ehci(struct platform_device *pdev)
 
 /*-------------------------------------------------------------------------*/
 
-static u64 at91_ehci_dma_mask = DMA_BIT_MASK(32);
-
 static int ehci_atmel_drv_probe(struct platform_device *pdev)
 {
        struct usb_hcd *hcd;
@@ -93,7 +91,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
         * Once we have dma capability bindings this can go away.
         */
        if (!pdev->dev.dma_mask)
-               pdev->dev.dma_mask = &at91_ehci_dma_mask;
+               pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+       if (!pdev->dev.coherent_dma_mask)
+               pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
        hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
        if (!hcd) {