From patchwork Thu Jan 9 14:00:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 23043 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8582E216DD for ; Thu, 9 Jan 2014 14:04:36 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id o6sf11696141oag.11 for ; Thu, 09 Jan 2014 06:04:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=j3PGM5qCQ8oIZtNb74iZe956+8WaLX3ZrrxeumUIDew=; b=FCANSjwI6BW2tIl3C4gkmLy/RIbqayZl7dZ09lN5Zru1wh/h7w0cUKJJaTdVdxlExY VWWJuic3SsezYN3+LVrS2pn7w+5VB/JpTht3iOxB9rL4H7GG6vpa2a6RSHQ6ksnsvUGF C9PbB/CMHkLkAWWjbC2CoR6pRzcQEPzvLN2ahVVcdN2uMasIbZc/2E1IIhVvgF2JpJXW c4iicttYiVxCj945jYFY1AaYiCdKqdsOLKRgWz5Xxi3MCLQYJFVGU5xAxJNQGNG5xBWi Ssp5mNIM2Tttt1nTuaG8REgQnEeZnzfYjn2o5yj3CIx4tcQDwpiIX17EybV1stmFq3Yp 0BzQ== X-Gm-Message-State: ALoCoQlFmywwjMx/DNa8P9CIC/I06c6nT/3TYAtodUlABNVme2uXOHjcZqEQ0bXRJrXmwTmAzunF X-Received: by 10.182.223.18 with SMTP id qq18mr1153502obc.33.1389276275648; Thu, 09 Jan 2014 06:04:35 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.103 with SMTP id c7ls1128224qen.24.gmail; Thu, 09 Jan 2014 06:04:35 -0800 (PST) X-Received: by 10.52.106.107 with SMTP id gt11mr2118377vdb.7.1389276275527; Thu, 09 Jan 2014 06:04:35 -0800 (PST) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id x7si2894147vel.38.2014.01.09.06.04.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 06:04:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id oz11so2395715veb.21 for ; Thu, 09 Jan 2014 06:04:35 -0800 (PST) X-Received: by 10.58.134.40 with SMTP id ph8mr1368803veb.61.1389276275390; Thu, 09 Jan 2014 06:04:35 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp14445ved; Thu, 9 Jan 2014 06:04:34 -0800 (PST) X-Received: by 10.66.146.133 with SMTP id tc5mr3919280pab.58.1389276274166; Thu, 09 Jan 2014 06:04:34 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ot3si4011840pac.282.2014.01.09.06.04.23; Thu, 09 Jan 2014 06:04:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756487AbaAIOET (ORCPT + 5 others); Thu, 9 Jan 2014 09:04:19 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:46973 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756162AbaAIODj (ORCPT ); Thu, 9 Jan 2014 09:03:39 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s09E2rrd021443; Thu, 9 Jan 2014 08:02:53 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s09E2rSB028924; Thu, 9 Jan 2014 08:02:53 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Thu, 9 Jan 2014 08:02:52 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s09E12Wb030058; Thu, 9 Jan 2014 08:02:50 -0600 From: Tero Kristo To: , , , , , , CC: , Subject: [PATCHv13 33/40] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Date: Thu, 9 Jan 2014 16:00:44 +0200 Message-ID: <1389276051-1326-34-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389276051-1326-1-git-send-email-t-kristo@ti.com> References: <1389276051-1326-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , DT clocks are mostly missing clkdm info now, and this causes an issue with counter32k which makes its slave idlemode wrong and prevents core idle. Fixed by initializing the hwmod clkdm pointers for omap3 also which makes sure the clkdm flag matching logic works properly. This patch also changes the return value for _init_clkdm to 0 for incorrect clkdm_name, as this a warning, not a fatal error. Signed-off-by: Tero Kristo Tested-by: Nishanth Menon Acked-by: Tony Lindgren --- arch/arm/mach-omap2/omap_hwmod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index cc24c95..433fe2f 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1578,7 +1578,7 @@ static int _init_clkdm(struct omap_hwmod *oh) if (!oh->clkdm) { pr_warning("omap_hwmod: %s: could not associate to clkdm %s\n", oh->name, oh->clkdm_name); - return -EINVAL; + return 0; } pr_debug("omap_hwmod: %s: associated to clkdm %s\n", @@ -4237,6 +4237,7 @@ void __init omap_hwmod_init(void) soc_ops.assert_hardreset = _omap2_assert_hardreset; soc_ops.deassert_hardreset = _omap2_deassert_hardreset; soc_ops.is_hardreset_asserted = _omap2_is_hardreset_asserted; + soc_ops.init_clkdm = _init_clkdm; } else if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) { soc_ops.enable_module = _omap4_enable_module; soc_ops.disable_module = _omap4_disable_module;