From patchwork Wed Dec 10 14:45:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 5469561 X-Patchwork-Delegate: horms@verge.net.au 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 0BE7CBEEA8 for ; Wed, 10 Dec 2014 14:45:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FB5320108 for ; Wed, 10 Dec 2014 14:45:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00A862010B for ; Wed, 10 Dec 2014 14:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757441AbaLJOpt (ORCPT ); Wed, 10 Dec 2014 09:45:49 -0500 Received: from mail-la0-f47.google.com ([209.85.215.47]:59042 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756398AbaLJOpt (ORCPT ); Wed, 10 Dec 2014 09:45:49 -0500 Received: by mail-la0-f47.google.com with SMTP id hz20so2553613lab.34 for ; Wed, 10 Dec 2014 06:45:47 -0800 (PST) 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=oqkdald/WfpYFX4j5NDj3qOjSKhg5hYON2Uwz/QTXFw=; b=B/+CWFTk89MuT4NfItWQ/5N380jrNi/NLe4x++zc8yvvQbGwMbFwWQQ+UCTXsvnb0d EYUqic73ASUszCIwmaBTp0vgnHlrP0UwebHBgTX3u7QWeL/OKfsHKVxSYcDupPPQBITV VEBeJ2bHbORWZFyebiXhSsJa5Et9CQXV92tgHwxjD5pS+3dm6j7HsHaykfUEujjvNmkj VRIuCshMlvND1nhpakpraFqeFZCTil302lLtNJTH/YsvBQEZUryWUT05zUhwruC5tfgd vXfp3a0YJkWDbjSJQa8g6WRq7eQmNBxBid6AQjMlWGyT7uoLEChtDrGF2r99sZKO3jdV 8cBA== X-Received: by 10.152.19.71 with SMTP id c7mr4401997lae.79.1418222747931; Wed, 10 Dec 2014 06:45:47 -0800 (PST) Received: from groucho.site (ipbcc08ee5.dynamic.kabel-deutschland.de. [188.192.142.229]) by mx.google.com with ESMTPSA id ky3sm781525lab.27.2014.12.10.06.45.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Dec 2014 06:45:46 -0800 (PST) From: Ulrich Hecht To: horms@verge.net.au, mturquette@linaro.org, geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH v7 6/6] ARM: shmobile: sh73a0: disable legacy clock initialization Date: Wed, 10 Dec 2014 15:45:27 +0100 Message-Id: <1418222727-19888-7-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1418222727-19888-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1418222727-19888-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.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 Disables sh73a0_clock_init() if CCF is enabled. Signed-off-by: Ulrich Hecht Acked-by: Laurent Pinchart Tested-by: Geert Uytterhoeven --- 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 93ebe34..354cab1 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -763,7 +763,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(); } @@ -782,8 +784,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); }