]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
use correct base clock for di_clk
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 15 May 2012 15:04:33 +0000 (17:04 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 15 May 2012 15:04:33 +0000 (17:04 +0200)
drivers/gpu/drm/imx/ipu-v3/ipu-di.c

index 7f79fd3c52e49f1736958b197bf586de64753b38..82d95a4e53c0aa39826aea100cc3fb8b99ac536e 100644 (file)
@@ -603,20 +603,15 @@ int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id,
                unsigned long base,
                u32 module, struct clk *ipu_clk)
 {
-       char *clk_id, *con_id;
+       const char *con_id;
        struct ipu_di *di = &dis[id];
 
        if (id > 1)
                return -EINVAL;
 
-       if (id)
-               clk_id = "di1";
-       else
-               clk_id = "di0";
-
        ipu_dev = dev;
 
-       di->clk = clk_get(dev, clk_id);
+       di->clk = clk_get(dev, NULL);
        if (IS_ERR(di->clk))
                return PTR_ERR(di->clk);