From patchwork Thu Nov 8 01:12:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 12727 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id B475A23E16 for ; Thu, 8 Nov 2012 01:13:34 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 68A0AA19298 for ; Thu, 8 Nov 2012 01:13:34 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3284280iej.11 for ; Wed, 07 Nov 2012 17:13:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=Tt6d/4h7sUTLBaLO+0xcIwgbiHgQJ7KTnfmRYzRfefE=; b=fvjCi28EsFiR/fNoLpVC/zo564h8rVsp0pMb1OGWXz7/drRzNFOL/46HI/9aos8b8p 8vmNkWQUUz3wo/iC9xxRfVpaQ0TuQ/m+eqpgQI1vIHKcEeLJYdBbYQyV1YNefiTn3EsZ bjMdfBCVJvBMYQ7rtdqsLRyBNAboDyZTp7Ed0HwlLTvjmGtjKbiwip+SqwqRu9NZ0lRR veNsTvDK+JMw9LlX+WlaWKUgCu/dCYoINEzFSatftZI5LASZ3vxxCwR2WYQp+4vVCq4K B8zJm9WrvNu5JYJUSRDY80EWGcQOqWgdOeNWPDGIpcSddCFXtLWnhwIoj0l4kUKOUAtS 4v+g== Received: by 10.50.140.97 with SMTP id rf1mr18293478igb.70.1352337213863; Wed, 07 Nov 2012 17:13:33 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp304321igt; Wed, 7 Nov 2012 17:13:33 -0800 (PST) Received: by 10.182.179.100 with SMTP id df4mr4399259obc.59.1352337213524; Wed, 07 Nov 2012 17:13:33 -0800 (PST) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com. [192.94.94.40]) by mx.google.com with ESMTPS id g3si22918503obb.138.2012.11.07.17.13.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 17:13:33 -0800 (PST) Received-SPF: pass (google.com: domain of mturquette@ti.com designates 192.94.94.40 as permitted sender) client-ip=192.94.94.40; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mturquette@ti.com designates 192.94.94.40 as permitted sender) smtp.mail=mturquette@ti.com Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id qA81DXpr019043; Wed, 7 Nov 2012 19:13:33 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qA81DWgD003750; Wed, 7 Nov 2012 19:13:33 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Wed, 7 Nov 2012 19:13:32 -0600 Received: from nucleus.nsc.com (nucleus.nsc.com [10.188.36.112]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id qA81DPLZ015450; Wed, 7 Nov 2012 19:13:32 -0600 From: Mike Turquette To: CC: , , , , Vaibhav Hiremath , Mike Turquette Subject: [PATCH 09/26] ARM: OMAP2+: hwmod: Invoke init_clkdm before other init functions Date: Wed, 7 Nov 2012 17:12:44 -0800 Message-ID: <1352337181-29427-10-git-send-email-mturquette@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352337181-29427-1-git-send-email-mturquette@ti.com> References: <1352337181-29427-1-git-send-email-mturquette@ti.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmXaiHsGs+Yi2+puMOsmKTeqK6/Dyt5nGIeibMZTmQs0KUoMctsWxxMj2M1TjUbwkYRaei/ From: Vaibhav Hiremath Without this kernel would crash, since clkdm inside omap_hwmod is accessed in some of the init funtion like, _init_main_clk. So call init_clkdm before _init_main_clk(). Signed-off-by: Vaibhav Hiremath Signed-off-by: Mike Turquette --- arch/arm/mach-omap2/omap_hwmod.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index ce93ec0..22a41f6 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1522,11 +1522,12 @@ static int _init_clocks(struct omap_hwmod *oh, void *data) pr_debug("omap_hwmod: %s: looking up clocks\n", oh->name); + if (soc_ops.init_clkdm) + ret |= soc_ops.init_clkdm(oh); + ret |= _init_main_clk(oh); ret |= _init_interface_clks(oh); ret |= _init_opt_clks(oh); - if (soc_ops.init_clkdm) - ret |= soc_ops.init_clkdm(oh); if (!ret) oh->_state = _HWMOD_STATE_CLKS_INITED;