video: lcdc: 3228: update colorspace config

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

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
old mode 100644 (file)
new mode 100755 (executable)
index 54ef695..0cde10e
--- 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;
@@ -490,7 +490,7 @@ 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;
@@ -506,9 +506,9 @@ 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)
+               if (cid == AMBA_CID || cid == CORESIGHT_CID)
                        dev->periphid = pid;
 
                if (!dev->periphid)