From patchwork Fri Feb 28 09:23:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 25524 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DC5DD203C5 for ; Fri, 28 Feb 2014 09:24:47 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf1031156pbc.2 for ; Fri, 28 Feb 2014 01:24:46 -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=IJFifDJ0b+lbcEQHMhKMpM6OtC3SbnKRfZxyRXNJicM=; b=Fyy6U6Bk+fPq6SFxKp86P6c+sl1Z+zgc5cs97xjCrPaDhqg53TvV6Nte+O7+T0OwW1 HdvwBJjnDZRGYDGMv+ribSR8kKXWCrmchWmnv+I/gs/PNn0YOz3o6Nz15N8TB36M3H/b awUznQbFoWLwl9SmiCbFWJFQ5USLX7WZurkrK3is8eO4Vr1Ww0SFkny3AvodMDjdfEQM UpJt1jlH0m4VNnwZUZPor2zmF+sUC40RqIdmRjXAV4pACS4rErCUgRIwUo+w6PQOIXZo Bcx7djE9fuYGj4OmlL9wKOET/I2Pgjlt4S729V5r+wPw1BMW5zNmjnAbVYxLvNQuGByO BAfA== X-Gm-Message-State: ALoCoQl7+ppoyYiDFNusmlG05bKDBPikoHaRAeN/EETPTm59osnxgwAxF7WF/ik26ZKKBe2oaajR X-Received: by 10.66.183.239 with SMTP id ep15mr736395pac.7.1393579486661; Fri, 28 Feb 2014 01:24:46 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.11 with SMTP id w11ls973932qgw.42.gmail; Fri, 28 Feb 2014 01:24:46 -0800 (PST) X-Received: by 10.221.29.196 with SMTP id rz4mr1611263vcb.8.1393579486521; Fri, 28 Feb 2014 01:24:46 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id eb8si395030vdb.138.2014.02.28.01.24.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Feb 2014 01:24:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu8so462158vcb.1 for ; Fri, 28 Feb 2014 01:24:46 -0800 (PST) X-Received: by 10.220.92.135 with SMTP id r7mr1531199vcm.11.1393579486355; Fri, 28 Feb 2014 01:24:46 -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.220.130.193 with SMTP id u1csp40823vcs; Fri, 28 Feb 2014 01:24:45 -0800 (PST) X-Received: by 10.66.197.164 with SMTP id iv4mr2449979pac.18.1393579485458; Fri, 28 Feb 2014 01:24:45 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id se8si1296836pbb.306.2014.02.28.01.24.44; Fri, 28 Feb 2014 01:24:44 -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 S1751586AbaB1JYn (ORCPT + 5 others); Fri, 28 Feb 2014 04:24:43 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:43806 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbaB1JYm (ORCPT ); Fri, 28 Feb 2014 04:24:42 -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 s1S9OHmR024187; Fri, 28 Feb 2014 03:24:17 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S9OHCU003443; Fri, 28 Feb 2014 03:24:17 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 28 Feb 2014 03:24:16 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S9NhsI015360; Fri, 28 Feb 2014 03:24:14 -0600 From: Tero Kristo To: , , , , CC: , Subject: [PATCH 12/12] ARM: OMAP2: clock: use DT clock boot if available Date: Fri, 28 Feb 2014 11:23:04 +0200 Message-ID: <1393579384-23440-13-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393579384-23440-1-git-send-email-t-kristo@ti.com> References: <1393579384-23440-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.220.170 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: , Otherwise legacy boot clock data is used. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/io.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index af432b1..e57088d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -53,6 +53,7 @@ #include "prm2xxx.h" #include "prm3xxx.h" #include "prm44xx.h" +#include "opp2xxx.h" /* * omap_clk_soc_init: points to a function that does the SoC-specific @@ -410,7 +411,12 @@ void __init omap2420_init_early(void) omap242x_clockdomains_init(); omap2420_hwmod_init(); omap_hwmod_init_postsetup(); - omap_clk_soc_init = omap2420_clk_init; + if (of_have_populated_dt()) { + omap_clk_soc_init = omap2420_dt_clk_init; + rate_table = omap2420_rate_table; + } else { + omap_clk_soc_init = omap2420_clk_init; + } } void __init omap2420_init_late(void) @@ -439,7 +445,12 @@ void __init omap2430_init_early(void) omap243x_clockdomains_init(); omap2430_hwmod_init(); omap_hwmod_init_postsetup(); - omap_clk_soc_init = omap2430_clk_init; + if (of_have_populated_dt()) { + omap_clk_soc_init = omap2430_dt_clk_init; + rate_table = omap2430_rate_table; + } else { + omap_clk_soc_init = omap2430_clk_init; + } } void __init omap2430_init_late(void)