From patchwork Thu Jan 9 14:00:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 23051 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9F970216DD for ; Thu, 9 Jan 2014 14:05:08 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id n12sf4000626wgh.1 for ; Thu, 09 Jan 2014 06:05:07 -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=zO7cP3zzvgvXd6lNY/ds2Q8J5oCcW1JEAPXePJz76oE=; b=cLFtnPiD7j0+7lkw59C9xNdzVOxOtH92184dNXYhe0WzaumBR1l7l+q8CLWGyxcjta 7b4TiYbqqUJNSjx4pm8ZrUyfeDYlZWsdp2Ooa2Is+SAtPoxuYtOjtk3THuUqomaLeBJO FLEtsiN/fWxmhUeZG2p+mYJANV5CGjU9jcxxj01PrD+IACrM+VSncSBSPNZf2CmXr06G 4+TtX0+orKTR/gdeAqI41p7MCQ15fpb+GLGKwyLIlcSH06AWt0kHuSUpFpFugkwPtuQN wIKpKGSVRUfKhY2Z9iJ3TVJDbqAuDXuhc9FZ7SJawJS7pgntb2KQ4QXwhnF6GWGG9XXR 4wXg== X-Gm-Message-State: ALoCoQkfNuXCkQ8syEjap2z5F/4g2so5NUX3BOt9JtBOEgpPuA6oKFj4suKCsQRpwfOTDfpu/Ge5 X-Received: by 10.14.100.3 with SMTP id y3mr1422068eef.6.1389276307183; Thu, 09 Jan 2014 06:05:07 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.103.136 with SMTP id fw8ls1029112qeb.20.gmail; Thu, 09 Jan 2014 06:05:07 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr1357730veb.39.1389276306998; Thu, 09 Jan 2014 06:05:06 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id vq3si2898086veb.27.2014.01.09.06.05.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 06:05:06 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id 10so469631vbe.38 for ; Thu, 09 Jan 2014 06:05:06 -0800 (PST) X-Received: by 10.58.181.71 with SMTP id du7mr2537457vec.25.1389276306771; Thu, 09 Jan 2014 06:05:06 -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 ey3csp14506ved; Thu, 9 Jan 2014 06:05:06 -0800 (PST) X-Received: by 10.66.121.68 with SMTP id li4mr3907173pab.33.1389276305684; Thu, 09 Jan 2014 06:05:05 -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.05.05; Thu, 09 Jan 2014 06:05:05 -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 S1751745AbaAIOEq (ORCPT + 5 others); Thu, 9 Jan 2014 09:04:46 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:46985 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756327AbaAIODx (ORCPT ); Thu, 9 Jan 2014 09:03:53 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s09E3HfJ021744; Thu, 9 Jan 2014 08:03:17 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s09E3H74025955; Thu, 9 Jan 2014 08:03:17 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Thu, 9 Jan 2014 08:03:16 -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 s09E12Wi030058; Thu, 9 Jan 2014 08:03:14 -0600 From: Tero Kristo To: , , , , , , CC: , Subject: [PATCHv13 40/40] ARM: OMAP3: use DT clock init if DT data is available Date: Thu, 9 Jan 2014 16:00:51 +0200 Message-ID: <1389276051-1326-41-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.212.51 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: , OMAP3 platforms support both DT and non-DT boot at the moment, make the clock init work according to the used setup. Signed-off-by: Tero Kristo Tested-by: Nishanth Menon Acked-by: Tony Lindgren --- arch/arm/mach-omap2/io.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index f28399f..b8097fe 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -488,21 +488,29 @@ void __init omap3_init_early(void) void __init omap3430_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3430_dt_clk_init; } void __init omap35xx_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3430_dt_clk_init; } void __init omap3630_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3630_dt_clk_init; } void __init am35xx_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = am35xx_dt_clk_init; } void __init ti81xx_init_early(void) @@ -520,7 +528,10 @@ void __init ti81xx_init_early(void) omap3xxx_clockdomains_init(); omap3xxx_hwmod_init(); omap_hwmod_init_postsetup(); - omap_clk_soc_init = omap3xxx_clk_init; + if (of_have_populated_dt()) + omap_clk_soc_init = ti81xx_dt_clk_init; + else + omap_clk_soc_init = omap3xxx_clk_init; } void __init omap3_init_late(void)