summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorJavier Martin <javier.martin@vista-silicon.com>2012-03-21 16:19:41 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-02 11:11:05 +0200
commit31e1a4e8b6b356bb7cc24e64d18f25e1b01e5a42 (patch)
treee4b4df410b29fdb4f487455560711785f1781c62 /arch/arm/mach-imx
parenteb26e877771ece01ca755c1bb34a2636a0758223 (diff)
downloadblackbird-obmc-linux-31e1a4e8b6b356bb7cc24e64d18f25e1b01e5a42.tar.gz
blackbird-obmc-linux-31e1a4e8b6b356bb7cc24e64d18f25e1b01e5a42.zip
MX2: Fix mx2_camera clock regression.
The following patch breaks mx2_camera driver: http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52f1a845e25dc0c6435153aca1a170e20b282429 This change fixes the problem. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/clock-imx27.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clock-imx27.c b/arch/arm/mach-imx/clock-imx27.c
index b9a95ed75553..98e04f5a87dd 100644
--- a/arch/arm/mach-imx/clock-imx27.c
+++ b/arch/arm/mach-imx/clock-imx27.c
@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(NULL, "dma", dma_clk)
_REGISTER_CLOCK(NULL, "rtic", rtic_clk)
_REGISTER_CLOCK(NULL, "brom", brom_clk)
+ _REGISTER_CLOCK(NULL, "emma", emma_clk)
_REGISTER_CLOCK("m2m-emmaprp.0", NULL, emma_clk)
_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk)
_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)
OpenPOWER on IntegriCloud