From patchwork Wed Dec 3 11:48:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 5429631 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 BFCC8BEEA8 for ; Wed, 3 Dec 2014 11:45:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6E00202FE for ; Wed, 3 Dec 2014 11:45:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD88D202F2 for ; Wed, 3 Dec 2014 11:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753672AbaLCLp0 (ORCPT ); Wed, 3 Dec 2014 06:45:26 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:50413 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662AbaLCLpZ (ORCPT ); Wed, 3 Dec 2014 06:45:25 -0500 Received: by mail-pd0-f171.google.com with SMTP id y13so15289855pdi.16 for ; Wed, 03 Dec 2014 03:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=laIE+wwCs41qxrAwrPFiV0VCrq/vShyOTzV2odwarew=; b=xDcZy+doTxCdcUpzhguEB3SCuBkVHEdvsfkC6lJ544FgHydqUF0a2WApCV+KpKndPp J6HEIObG8Y5+x6t45HNqz7qJn2ZhLcqi+sMCMyQB2WnU66eLl/12r+ILQRIcd1rHgfvY 0JKuX3rAMXKkwLxrp1ljf/xw5Xe7/FYLsx2Hi+/jEAMiJnbiK+hq1WHHE2iJHY4rc1z1 q8M5S5csyQrQOv+yjWfh9mFhEhNs1YjFLk52jiLegmsc7k6POconPzKGIT4HkueUdmqL G2MZSW3/v44xzs6ZRZcey4xdQD5eZfLF5DUhd7ORyoLSNqkW3K+iiRvc9uwv31D8eB7s JnUw== X-Received: by 10.66.235.74 with SMTP id uk10mr8235572pac.16.1417607124602; Wed, 03 Dec 2014 03:45:24 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id ht3sm23041463pad.18.2014.12.03.03.45.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2014 03:45:23 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, ulrich.hecht@gmail.com Date: Wed, 03 Dec 2014 20:48:04 +0900 Message-Id: <20141203114804.5871.51568.sendpatchset@w520> Subject: [PATCH v2] ARM: shmobile: Fix is_e2 warning 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 From: Magnus Damm Fix "is_e2" warning introduced by: 9ce3fa6 ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794 Only triggers on kernel configurations that have ARCH_ARM_TIMER=n. Signed-off-by: Magnus Damm --- Changes since V1: - Use of_machine_is_compatible() arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-11-28 12:55:44.000000000 +0900 @@ -52,15 +52,13 @@ void __init rcar_gen2_timer_init(void) { #if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK) u32 mode = rcar_gen2_read_mode_pins(); - bool is_e2 = (bool)of_find_compatible_node(NULL, NULL, - "renesas,r8a7794"); #endif #ifdef CONFIG_ARM_ARCH_TIMER void __iomem *base; int extal_mhz = 0; u32 freq; - if (is_e2) { + if (of_machine_is_compatible("renesas,r8a7794")) { freq = 260000000 / 8; /* ZS / 8 */ /* CNTVOFF has to be initialized either from non-secure * Hypervisor mode or secure Monitor mode with SCR.NS==1.