diff options
| author |  Benjamin Herrenschmidt <benh@kernel.crashing.org>
| 2014-01-29 16:53:55 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org>
| 2014-01-29 16:53:55 +1100 |
| commit | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (patch) | |
| tree | 11e9d240d87834f9da927aaa4027e7dfcbd01eb8 /drivers/media | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | powerpc/512x: dts: add MPC5125 clock specs (diff) | |
| download | linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.gz linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.bz2 linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.zip | |
Merge remote-tracking branch 'agust/next' into next
<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/fsl-viu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 6a232239ee8c..dbf0ce38a8e7 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1580,7 +1580,7 @@ static int viu_of_probe(struct platform_device *op) } /* enable VIU clock */ - clk = devm_clk_get(&op->dev, "viu_clk"); + clk = devm_clk_get(&op->dev, "ipg"); if (IS_ERR(clk)) { dev_err(&op->dev, "failed to lookup the clock!\n"); ret = PTR_ERR(clk); |