From patchwork Mon Aug 18 15:51:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 4737771 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5ECF29F37E for ; Mon, 18 Aug 2014 15:52:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 995A520131 for ; Mon, 18 Aug 2014 15:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C218420120 for ; Mon, 18 Aug 2014 15:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbaHRPwS (ORCPT ); Mon, 18 Aug 2014 11:52:18 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:45316 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbaHRPwR (ORCPT ); Mon, 18 Aug 2014 11:52:17 -0400 Received: by mail-la0-f41.google.com with SMTP id s18so4742243lam.14 for ; Mon, 18 Aug 2014 08:52:16 -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=ZQQfMy6DBZ/uproH08z2cpkJz1SRU2RI32nrBgfWDXE=; b=Rx0/GkgCWDotVMmOPVd9wJuC5ImdGO4UN2hb6enxQPLO6iJrFdnnDdRQoQ5PBH0ush 557dyzWL6iUeIyRn0TFqHaOAnbDDxTfpnNSiV6CYeCZPLAFzT0ACgaXbyCD2iuBRdpNp /Khq6EvM+0ZEM3ukS3P2oVQrI/i78/9CiFg/Auo5MF6AsEYSNAf8msZIGydamYQuZuQz i7gqRN8rsNkOrh2Y2prG0bgzjeXlt1fszQTnA4a6DWWpbljsvRRjpJgotvjQQmMGwpiw PSnUXBMGjUhs1a27GAoy1azg1jYHysf+hW/grnQXBDUIAyDFDWPHkJAN1vXtQZazl+f9 yMCA== X-Received: by 10.152.25.170 with SMTP id d10mr29874151lag.37.1408377136168; Mon, 18 Aug 2014 08:52:16 -0700 (PDT) Received: from groucho.site ([46.166.186.241]) by mx.google.com with ESMTPSA id mi10sm27702193lbc.19.2014.08.18.08.52.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Aug 2014 08:52:15 -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 5/8] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Date: Mon, 18 Aug 2014 17:51:44 +0200 Message-Id: <1408377107-3822-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1408377107-3822-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1408377107-3822-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=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 942efdc..0b01770 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, 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; @@ -74,9 +74,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; } @@ -86,7 +87,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);