Merge tag 'lsk-v3.10-android-15.01'

[firefly-linux-kernel-4.4.55.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 4144a3a999bd72322dea3a1105e5c19323bd1516..9d3a90397d16e68bafda9eb4650778b8ef26cef8 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -284,7 +284,7 @@ static const struct dev_pm_ops amba_pm = {
        SET_RUNTIME_PM_OPS(
                amba_pm_runtime_suspend,
                amba_pm_runtime_resume,
-               pm_generic_runtime_idle
+               NULL
        )
 };
 
@@ -361,9 +361,9 @@ static int amba_probe(struct device *dev)
        int ret;
 
        do {
-               ret = amba_get_enable_pclk(pcdev);
-               if (ret)
-                       break;
+               //ret = amba_get_enable_pclk(pcdev);
+               //if (ret)
+               //      break;
 
                pm_runtime_get_noresume(dev);
                pm_runtime_set_active(dev);
@@ -377,7 +377,7 @@ static int amba_probe(struct device *dev)
                pm_runtime_set_suspended(dev);
                pm_runtime_put_noidle(dev);
 
-               amba_put_disable_pclk(pcdev);
+               //amba_put_disable_pclk(pcdev);
        } while (0);
 
        return ret;
@@ -421,6 +421,7 @@ int amba_driver_register(struct amba_driver *drv)
 {
        drv->drv.bus = &amba_bustype;
 
+
 #define SETFN(fn)      if (drv->fn) drv->drv.fn = amba_##fn
        SETFN(probe);
        SETFN(remove);
@@ -489,7 +490,8 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
                goto err_release;
        }
 
-       ret = amba_get_enable_pclk(dev);
+//     ret = amba_get_enable_pclk(dev);
+       ret = 0;
        if (ret == 0) {
                u32 pid, cid;
 
@@ -504,7 +506,7 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
                        cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
                                (i * 8);
 
-               amba_put_disable_pclk(dev);
+//             amba_put_disable_pclk(dev);
 
                if (cid == AMBA_CID || cid == CORESIGHT_CID)
                        dev->periphid = pid;