From patchwork Thu Nov 6 16:50:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 5245631 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 E5A26C11AC for ; Thu, 6 Nov 2014 16:51:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19F3B20120 for ; Thu, 6 Nov 2014 16:51:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F8E7200F3 for ; Thu, 6 Nov 2014 16:51:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752523AbaKFQv1 (ORCPT ); Thu, 6 Nov 2014 11:51:27 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:42539 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752383AbaKFQvJ (ORCPT ); Thu, 6 Nov 2014 11:51:09 -0500 Received: by mail-wi0-f179.google.com with SMTP id h11so2105953wiw.6 for ; Thu, 06 Nov 2014 08:51:08 -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=ohskPTQEVAo7th/hdI8JHUuN3wPTdY09KpX5V2oOqUM=; b=JuDSWIr7ewJoAqV89D8Tfx5s1dwcxK07PkPDvC4kP+5EY0k5FPljx6Sk71TrXBD9bQ fVz32dmNBY260hHnQqzZUHOnk6+8sLPqvQ4Sp5aSEEaC0kUoXJ9TmVDQE8JbW7OKpWR6 Zl4gn4E2nKbnwqaOHqpZKyojFKeEPrTEgrYl1W1PdxRCAoTwgTbpFCigauP5imgeXRp0 6kZgJuk6mfNhTvKjYVzgC4ZHY566OQtGBzdK816maA8hecbUFn+mwcnMQy3XeDQvK1Zc Ao1PES+Zca0J3JqsFrVzidwuvGxZdgVt0Ptf/4nFBKK71pEesGO2MjFcpm8i1Z9S5lXf wDwQ== X-Received: by 10.180.86.198 with SMTP id r6mr43077501wiz.29.1415292668758; Thu, 06 Nov 2014 08:51:08 -0800 (PST) Received: from groucho.site (ipbcc2fb1c.dynamic.kabel-deutschland.de. [188.194.251.28]) by mx.google.com with ESMTPSA id rx8sm8471509wjb.30.2014.11.06.08.51.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Nov 2014 08:51:07 -0800 (PST) From: Ulrich Hecht To: horms@verge.net.au, geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com Cc: mturquette@linaro.org, linux-sh@vger.kernel.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH v4 6/6] ARM: shmobile: sh73a0: disable legacy clock initialization Date: Thu, 6 Nov 2014 17:50:41 +0100 Message-Id: <1415292641-30331-7-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1415292641-30331-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1415292641-30331-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); }