From patchwork Fri Nov 7 15:52:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 5253911 X-Patchwork-Delegate: horms@verge.net.au 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 84C209F3ED for ; Fri, 7 Nov 2014 15:52:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5C3520131 for ; Fri, 7 Nov 2014 15:52:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA10E20149 for ; Fri, 7 Nov 2014 15:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751459AbaKGPwX (ORCPT ); Fri, 7 Nov 2014 10:52:23 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:35357 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278AbaKGPwW (ORCPT ); Fri, 7 Nov 2014 10:52:22 -0500 Received: by mail-wi0-f173.google.com with SMTP id n3so4974097wiv.12 for ; Fri, 07 Nov 2014 07:52:21 -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=LWEg9J7rEs0Zp7/BNzGZxUlipj+J/ys0+aMoY5iMuJ4=; b=DADCfOguu2oiGT7kZfhNC/eYNkopQVYBz+fL1aaiH704SKcR5ucyvTKkjTkpM9zQVW n/mnraIOPeb7ql2fGsepOReV2F/aJXo4nu5Qs7+RuVQuqCSBZE7sa2AjKqEYogapc1ly 6RybMfnO9hI1VpVeE2zjNXBrz+0P9/wldj2lMNlN6CUY/uCblEXnEnWT38OnKL353dHy 5a0vApYbMPZHaWGjEtjoK7k9QWnVLAPHFLNHWOpMYWoIWnXDLZO9eMaaC0w9XyOEwN+X x9rpLA4pWuvmJiAfyEL4GTULCP7ODenE5CSJwX3GjNjB2wAdL75kbXRDTDbvBl6ELfbj m2cw== X-Received: by 10.194.82.104 with SMTP id h8mr17655248wjy.44.1415375541595; Fri, 07 Nov 2014 07:52:21 -0800 (PST) Received: from groucho.site (ipbcc296c3.dynamic.kabel-deutschland.de. [188.194.150.195]) by mx.google.com with ESMTPSA id s10sm2492974wix.14.2014.11.07.07.52.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 07:52:21 -0800 (PST) From: Ulrich Hecht To: horms@verge.net.au, mturquette@linaro.org, geert@linux-m68k.org Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart+renesas@ideasonboard.com, Ulrich Hecht Subject: [PATCH 5/6] ARM: shmobile: ape6evm: disable legacy clock initialization Date: Fri, 7 Nov 2014 16:52:03 +0100 Message-Id: <1415375524-15468-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1415375524-15468-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1415375524-15468-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 r8a73a4_clock_init() if CCF is enabled. Signed-off-by: Ulrich Hecht --- arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 3b68370..dd5bc63 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -29,7 +29,7 @@ static void __init ape6evm_add_standard_devices(void) { - +#ifndef CONFIG_COMMON_CLK struct clk *parent; struct clk *mp; @@ -43,6 +43,7 @@ static void __init ape6evm_add_standard_devices(void) clk_set_parent(mp, parent); clk_put(parent); clk_put(mp); +#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }