From patchwork Thu Jul 26 11:20:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 13488 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SuM7m-0007ZI-L6 for patchwork@linuxtv.org; Thu, 26 Jul 2012 13:20:58 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1SuM7l-00045G-Ix; Thu, 26 Jul 2012 13:20:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444Ab2GZLUv (ORCPT ); Thu, 26 Jul 2012 07:20:51 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:49924 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428Ab2GZLUu (ORCPT ); Thu, 26 Jul 2012 07:20:50 -0400 Received: by mail-we0-f174.google.com with SMTP id x8so1257392wey.19 for ; Thu, 26 Jul 2012 04:20:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=g8Oa3d49by9sqw0BQWM7K9xMIadv7x4eK6zwiBlKDCU=; b=iBEg+D4X+TnnjMPGRLAfxW0qecFljjBV0oE9yrON1XfpAd5SqL3Pe/2LhwkM8C/o/S q7sYNdRedEpe8/1X7K7s/H9ewW61DO01yUKTDBntjar/XP9uPUcZV7wZ1qhTCD6d2rC4 Y0bmmv7yexc5WVvODQHeTEhxyAiwXF6XsDywb1WXuEsWP2f2V3cRcCkMjruld9yCiDG5 RCQDRcp1hRcQZiLQ/zZwDp2NLpD6nPHon6MvxHrxsrOvJlk5zVUpO3w6faZr/McguyD3 ScDIujVgbIQKwgKESt5hhdbIkDL6faahmp3lNaViwIGbVmg2TbLVTq8D/iOtRA3AMs7N 42qg== Received: by 10.180.100.37 with SMTP id ev5mr12694348wib.5.1343301649687; Thu, 26 Jul 2012 04:20:49 -0700 (PDT) Received: from piscis.vsilicon.net (96.252.106.212.dynamic.jazztel.es. [212.106.252.96]) by mx.google.com with ESMTPS id o2sm11826677wiz.11.2012.07.26.04.20.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 04:20:49 -0700 (PDT) From: Javier Martin To: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, fabio.estevam@freescale.com, g.liakhovetski@gmx.de, sakari.ailus@maxwell.research.nokia.com, kyungmin.park@samsung.com, s.nawrocki@samsung.com, laurent.pinchart@ideasonboard.com, mchehab@infradead.org, linux@arm.linux.org.uk, kernel@pengutronix.de, Javier Martin Subject: [PATCH 1/4] i.MX27: Fix emma-prp and csi clocks. Date: Thu, 26 Jul 2012 13:20:34 +0200 Message-Id: <1343301637-19676-2-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343301637-19676-1-git-send-email-javier.martin@vista-silicon.com> References: <1343301637-19676-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQlvVjD3eYmbzz1o2xONvJWwebwN8nQ2lwkL1510YkvsftnZOYot+aE3xumyX1aCuAyhC4w4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.7.26.110632 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Naming of emma-prp related clocks for the i.MX27 is not correct. Signed-off-by: Javier Martin --- arch/arm/mach-imx/clk-imx27.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index b1d343c..6e9cb02 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -223,7 +223,7 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0"); clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0"); clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0"); - clk_register_clkdev(clk[csi_ahb_gate], NULL, "mx2-camera.0"); + clk_register_clkdev(clk[csi_ahb_gate], "ahb", "mx2-camera.0"); clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); @@ -250,8 +250,10 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1"); clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0"); clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad"); - clk_register_clkdev(clk[emma_ahb_gate], "ahb", "imx-emma"); - clk_register_clkdev(clk[emma_ipg_gate], "ipg", "imx-emma"); + clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "mx2-camera.0"); + clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "mx2-camera.0"); + clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0"); + clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0"); clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL); clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL); clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL);