From patchwork Fri Aug 29 18:15:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 4812011 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69270C0338 for ; Fri, 29 Aug 2014 18:15:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3A9A20122 for ; Fri, 29 Aug 2014 18:15:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3D512011B for ; Fri, 29 Aug 2014 18:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753214AbaH2SPZ (ORCPT ); Fri, 29 Aug 2014 14:15:25 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:62929 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbaH2SPY (ORCPT ); Fri, 29 Aug 2014 14:15:24 -0400 Received: by mail-wg0-f49.google.com with SMTP id y10so2520454wgg.8 for ; Fri, 29 Aug 2014 11:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=2OnxCRFBW4tbDdiBeswKc6Jga2Jzh+Do3tJ/ab5FIdo=; b=kzgU8U1sRnM2lfy9okfrm0HrPzwrS372D8L8Oq4D8JOHKgCt4upB5R7/6NPBasKEnd AvfwdThh8Q/dzVqV/Yt2Iel2wJDAfv3LLmQApr3yOxQUJt8WNgRWL4on2XUAblZCGoL6 oysNRZJlkmH+2/ntGzHd0i8HUqSdXL8mlSOgseCoIQPqigZn+Tto/BboK5sPrtdEKxZu zBdt8v6NHaBgDdb5YAtUJRznqgVKeNeOG6mZmjQxO1xRhwwEzR/c1DeaerUWxQscTCGt Zv3JqUY4DHU4pY5Sv5WyryuYAnfG7nWQ6a9uoGkzWHtK1b2oY+dM1tYOAl980rQJU1yA clgw== X-Received: by 10.180.101.65 with SMTP id fe1mr5572475wib.53.1409336123400; Fri, 29 Aug 2014 11:15:23 -0700 (PDT) Received: from groucho.site ([91.108.183.74]) by mx.google.com with ESMTPSA id dc9sm49453125wib.5.2014.08.29.11.15.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Aug 2014 11:15:22 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au Cc: linux-sh@vger.kernel.org, mturquette@linaro.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH v2 1/6] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Date: Fri, 29 Aug 2014 20:15:05 +0200 Message-Id: <1409336110-32734-2-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409336110-32734-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1409336110-32734-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ulrich Hecht --- arch/arm/mach-shmobile/timer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index adce98b..87c6be1 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -43,7 +43,7 @@ static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz, void __init shmobile_init_delay(void) { struct device_node *np, *cpus; - bool is_a8_a9 = false; + bool is_a7_a8_a9 = false; bool is_a15 = false; u32 max_freq = 0; @@ -57,9 +57,10 @@ void __init shmobile_init_delay(void) if (!of_property_read_u32(np, "clock-frequency", &freq)) max_freq = max(max_freq, freq); - if (of_device_is_compatible(np, "arm,cortex-a8") || + if (of_device_is_compatible(np, "arm,cortex-a7") || + of_device_is_compatible(np, "arm,cortex-a8") || of_device_is_compatible(np, "arm,cortex-a9")) - is_a8_a9 = true; + is_a7_a8_a9 = true; else if (of_device_is_compatible(np, "arm,cortex-a15")) is_a15 = true; } @@ -69,7 +70,7 @@ void __init shmobile_init_delay(void) if (!max_freq) return; - if (is_a8_a9) + if (is_a7_a8_a9) shmobile_setup_delay_hz(max_freq, 1, 3); else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) shmobile_setup_delay_hz(max_freq, 2, 4);