From patchwork Tue Oct 28 17:02:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 5178551 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 B3BB1C11AD for ; Tue, 28 Oct 2014 17:02:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE565201CD for ; Tue, 28 Oct 2014 17:02:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1649420219 for ; Tue, 28 Oct 2014 17:02:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753410AbaJ1RCm (ORCPT ); Tue, 28 Oct 2014 13:02:42 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:51138 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153AbaJ1RCl (ORCPT ); Tue, 28 Oct 2014 13:02:41 -0400 Received: by mail-wg0-f46.google.com with SMTP id x13so1380463wgg.5 for ; Tue, 28 Oct 2014 10:02:40 -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=huU1XONPmGEDpNJJKezpTdUbyhRwmzzLZMpcd6/nb3M=; b=NKPJcTfPlYM6G68AKyDynn758kO+imByzE9IlzWI5M5W8H6mIhmQYJMSogywnw73sr lkb6CUdptgcxTZfBuCvZAgBAwF9DLyy9xDF905rrOYV07xAJyAXwMCpvqMhKv0TvjyX0 2UkNfXW8C0ZGLvy6ld8tbLf4J7yQnDtGWr2O4wZuoeqnRfnxJeyQ2J6X4XeBGngDsP5j jtsFiKhguWCmsZcUUcvcWkxkW9bzbzzLdiM043wf50vC7BaEV8YuUBZzIRWudHTz5dUl vNooD/gnZ2iKmk5ErH8jvjdM1LQ8UD/oyGbS6YjoZ2toP5GGKTttcs9syW8l3XW/bbSY HJQg== X-Received: by 10.180.94.34 with SMTP id cz2mr29179850wib.4.1414515760697; Tue, 28 Oct 2014 10:02:40 -0700 (PDT) Received: from groucho.site (ipbcc29c85.dynamic.kabel-deutschland.de. [188.194.156.133]) by mx.google.com with ESMTPSA id bj7sm2452564wjc.33.2014.10.28.10.02.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Oct 2014 10:02:40 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au, mturquette@linaro.org Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart+renesas@ideasonboard.com, geert@linux-m68k.org, Ulrich Hecht Subject: [PATCH v3 6/7] ARM: shmobile: sh73a0: disable legacy clock initialization Date: Tue, 28 Oct 2014 18:02:15 +0100 Message-Id: <1414515736-24905-7-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1414515736-24905-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1414515736-24905-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.4 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 Disables sh73a0_clock_init() if CCF is enabled. Signed-off-by: Ulrich Hecht Acked-by: Laurent Pinchart --- arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index 2955a08..3134bc1 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -742,7 +742,9 @@ void __init __weak sh73a0_register_twd(void) { } void __init sh73a0_earlytimer_init(void) { shmobile_init_delay(); +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); +#endif shmobile_earlytimer_init(); sh73a0_register_twd(); } @@ -761,8 +763,9 @@ void __init sh73a0_add_early_devices(void) void __init sh73a0_add_standard_devices_dt(void) { /* clocks are setup late during boot in the case of DT */ +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); - +#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }